Working on forms
Merge branch 'master' of https://github.com/keshavashta/iosApp

Conflicts:
	trunk/www/js/services/initService.js