Re-creation
Merge branch 'master' of https://github.com/alexzam/HIS-MobileApp

Conflicts:
	AndroidManifest.xml
Storing categories in DB.