Merge branch 'master' of https://github.com/AAST-IDC/Android-App.git

Conflicts:
	README.md