no message
Merge branch 'develop' of https://github.com/ajency/Minyawns-Ionic-App into working

Conflicts:
	www/views/singlejob.html
no message
no message
Merge branch 'develop' of https://github.com/ajency/Minyawns-Ionic-App into working
Merge branch 'develop' of https://github.com/ajency/Minyawns-Ionic-App into working
no message
Merge branch 'develop' of https://github.com/ajency/Minyawns-Ionic-App into working
no message
Merge branch 'develop' of https://github.com/ajency/Minyawns-Ionic-App into working
no message