routes update
Merge branch 'master' of https://github.com/Bharatupgraded/pillphone

Conflicts:
	config/routes.rb