Merge branch 'master' of github.com:changyou/anthCraft-mobile into dev
add log4js
add grunt-notify
Merge branch 'dev' of github.com:changyou/anthCraft-mobile into dev
Merge branch 'master' of github.com:changyou/anthCraft-mobile
Merge branch 'dev' of github.com:changyou/anthCraft-mobile into dev
Merge branch 'master' of github.com:changyou/anthCraft-mobile into dev
add index
Merge branch 'dev' of github.com:mememix/anthCraft-mobile into tmp

Conflicts:
	app/styles/main.less
	views/partials/pageHead.ejs
ignore logs
Merge branch 'tmp' into dev

Conflicts:
	.gitignore