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

alt236 · alt236 · commit 51c9e5ca90ae · 2015-07-14T17:18:04.000+01:00
Conflicts:
	README.md
diff --git a/README.md b/README.md
@@ -174,4 +174,4 @@ All logos are the property of their respective owners.
 
 The code in this project is licensed under the Apache Software License 2.0.
 
-Copyright (c) 2014 Alexandros Schillings.
+Copyright (c) 2014 Alexandros Schillings.

Original file line number	Diff line number	Diff line change
`@@ -174,4 +174,4 @@ All logos are the property of their respective owners.`
`174`	`174`
`175`	`175`	`The code in this project is licensed under the Apache Software License 2.0.`
`176`	`176`
`177`		`-Copyright (c) 2014 Alexandros Schillings.`
	`177`	`+Copyright (c) 2014 Alexandros Schillings.`