Merge branch 'master' of github.com:alt236/Bluetooth-LE-Library---Android

Conflicts:
	README.md
This commit is contained in:
Alexandros Schillings
2015-07-14 17:18:04 +01:00