Initial commit
Post lib-magic changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/pom.xml
Use Android 4.1 (API level 16) consistently