fix for routing issue
qw
Merge branch 'master' of https://github.com/shouvikbhuiyan1990/babySite

Conflicts:
	app/scripts/factory/dataFactory.js
	app/views/adminParent.html