git pull
Merge branch 'master' of https://github.com/stoianpp/HybridMobilesProject

Conflicts:
	FirstHybridProject/scripts/app/app.js
	FirstHybridProject/scripts/app/users.js
Merge branch 'master' of https://github.com/stoianpp/HybridMobilesProject
Git fixing
Merge branch 'master' of https://github.com/stoianpp/HybridMobilesProject

Conflicts:
	OfficeControlApp/OfficeControlMobile/OfficeControlMobile.v12.suo