Merge pull request #1 from xujihui1985/master

test
Merge pull request #2 from xujihui1985/master

merge
add deals page
Merge branch 'master' of https://github.com/chenyork/Transformers

Conflicts:
	app/index.html
	app/styles/main.css
	app/views/main.html
	bower.json
work on the ng-grid
add dataservice
merge from remote
merge from jasper
merge from york