Client side validations, forgot password
Merge branch 'master' of https://github.com/priyasaini/aakash_app

Conflicts:
	app/Settings/controller.rb
	build.yml
	rhosimulator/WebpageIcons.db
	rhosimulator/db/syncdblocal.sqlite
	rhosimulator/rholog.txt
	rhosimulator/rholog.txt_pos
	rhosimulator/rhosimconfig.txt
Resolved conflicts