edit some issues
no message
Merge branch 'master' of https://github.com/HashAppsLabs/HajjAndOmra

Conflicts:
	app/controllers/aboutApp.js
index.js
Merge branch 'master' of https://github.com/HashAppsLabs/HajjAndOmra

Conflicts:
	app/controllers/index.js