Updated Design
Merge branch 'master' of https://github.com/himanverma/openrug.com

Conflicts:
	app/View/Users/changepass.ctp
	app/View/Users/order.ctp