add order Details
Merge branch 'master' of https://github.com/geoonn/app

Conflicts:
	alloy.js
	views/index.xml
remove home button at login page