setup pages relationship:LandingPage->index->MyGroups->OneGroup
add functions:signin/signup/signout/create_group
rename index page css file
Update web pageswq
add an animation for button
Merge branch 'mia_dev' of https://github.com/us4us/seed into mia_dev
update index page
add some script call
deploy angularjs (0)
add background pic
merge all changes from minghe_dev, start to work on mia_dev branch
add some css files? because merge
failed to merge; delete old files
fix comments,attendees,,,show;
migrate to new look--0wq
 migrate to new look --1
migrate to new look --2
change mode of files
Merge branch 'mia_dev' into dev

Conflicts:
	public/app/css/button.css
	public/app/css/index.css
	public/app/css/styles.css
	public/app/img/bg.jpg
	public/app/img/group_img.png
	public/app/index.html
	public/app/js/app.js
	public/app/js/controllers/GroupCheckoutsController.js
	public/app/js/controllers/UserGroupsController.js
	public/app/js/controllers/UserSignController.js
	public/app/js/services/common.js
	public/app/partials/guide.html
	public/app/partials/login.html
	public/app/partials/onegroup.html
	public/app/partials/user.html
	public/node_modules/karma-chrome-launcher/package.json
	public/node_modules/karma-firefox-launcher/package.json
	public/node_modules/karma-jasmine/package.json
	public/node_modules/karma-junit-reporter/package.json
	public/node_modules/karma/node_modules/chokidar/node_modules/recursive-readdir/package.json
	public/node_modules/karma/node_modules/chokidar/package.json
	public/node_modules/karma/node_modules/coffee-script/package.json
	public/node_modules/karma/node_modules/colors/package.json
	public/node_modules/karma/node_modules/connect/node_modules/buffer-crc32/package.json
	public/node_modules/karma/node_modules/connect/node_modules/bytes/package.json
	public/node_modules/karma/node_modules/connect/node_modules/cookie-signature/package.json
	public/node_modules/karma/node_modules/connect/node_modules/cookie/package.json
	public/node_modules/karma/node_modules/connect/node_modules/debug/History.md
	public/node_modules/karma/node_modules/connect/node_modules/debug/component.json
	public/node_modules/karma/node_modules/connect/node_modules/debug/node.js
	public/node_modules/karma/node_modules/connect/node_modules/debug/node_modules/ms/package.json
	public/node_modules/karma/node_modules/connect/node_modules/debug/package.json
	public/node_modules/karma/node_modules/connect/node_modules/formidable/package.json
	public/node_modules/karma/node_modules/connect/node_modules/fresh/package.json
	public/node_modules/karma/node_modules/connect/node_modules/methods/package.json
	public/node_modules/karma/node_modules/connect/node_modules/pause/package.json
	public/node_modules/karma/node_modules/connect/node_modules/qs/package.json
	public/node_modules/karma/node_modules/connect/node_modules/send/node_modules/range-parser/package.json
	public/node_modules/karma/node_modules/connect/node_modules/send/package.json
	public/node_modules/karma/node_modules/connect/node_modules/uid2/package.json
	public/node_modules/karma/node_modules/connect/package.json
	public/node_modules/karma/node_modules/di/package.json
	public/node_modules/karma/node_modules/glob/node_modules/inherits/package.json
	public/node_modules/karma/node_modules/glob/package.json
	public/node_modules/karma/node_modules/graceful-fs/package.json
	public/node_modules/karma/node_modules/http-proxy/node_modules/optimist/node_modules/minimist/package.json
	public/node_modules/karma/node_modules/http-proxy/node_modules/optimist/node_modules/wordwrap/package.json
	public/node_modules/karma/node_modules/http-proxy/node_modules/optimist/package.json
	public/node_modules/karma/node_modules/http-proxy/node_modules/pkginfo/package.json
	public/node_modules/karma/node_modules/http-proxy/node_modules/utile/node_modules/async/package.json
	public/node_modules/karma/node_modules/http-proxy/node_modules/utile/node_modules/deep-equal/package.json
	public/node_modules/karma/node_modules/http-proxy/node_modules/utile/node_modules/i/package.json
	public/node_modules/karma/node_modules/http-proxy/node_modules/utile/node_modules/mkdirp/node_modules/minimist/package.json
	public/node_modules/karma/node_modules/http-proxy/node_modules/utile/node_modules/mkdirp/package.json
	public/node_modules/karma/node_modules/http-proxy/node_modules/utile/node_modules/ncp/package.json
	public/node_modules/karma/node_modules/http-proxy/node_modules/utile/package.json
	public/node_modules/karma/node_modules/http-proxy/package.json
	public/node_modules/karma/node_modules/lodash/package.json
	public/node_modules/karma/node_modules/log4js/node_modules/async/package.json
	public/node_modules/karma/node_modules/log4js/node_modules/readable-stream/node_modules/core-util-is/package.json
	public/node_modules/karma/node_modules/log4js/node_modules/readable-stream/node_modules/inherits/package.json
	public/node_modules/karma/node_modules/log4js/node_modules/readable-stream/node_modules/isarray/package.json
	public/node_modules/karma/node_modules/log4js/node_modules/readable-stream/node_modules/string_decoder/package.json
	public/node_modules/karma/node_modules/log4js/node_modules/readable-stream/package.json
	public/node_modules/karma/node_modules/log4js/node_modules/semver/package.json
	public/node_modules/karma/node_modules/log4js/package.json
	public/node_modules/karma/node_modules/mime/package.json
	public/node_modules/karma/node_modules/minimatch/node_modules/lru-cache/package.json
	public/node_modules/karma/node_modules/minimatch/node_modules/sigmund/package.json
	public/node_modules/karma/node_modules/minimatch/package.json
	public/node_modules/karma/node_modules/optimist/node_modules/wordwrap/package.json
	public/node_modules/karma/node_modules/optimist/package.json
	public/node_modules/karma/node_modules/q/package.json
	public/node_modules/karma/node_modules/rimraf/package.json
	public/node_modules/karma/node_modules/socket.io/node_modules/base64id/package.json
	public/node_modules/karma/node_modules/socket.io/node_modules/policyfile/package.json
	public/node_modules/karma/node_modules/socket.io/node_modules/redis/package.json
	public/node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_modules/active-x-obfuscator/node_modules/zeparser/package.json
	public/node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_modules/active-x-obfuscator/package.json
	public/node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_modules/uglify-js/package.json
	public/node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Makefile
	public/node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/binding.Makefile
	public/node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/bufferutil.target.mk
	public/node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/config.gypi
	public/node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/validation.target.mk
	public/node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/node_modules/commander/package.json
	public/node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/node_modules/nan/package.json
	public/node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/node_modules/options/package.json
	public/node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/node_modules/tinycolor/package.json
	public/node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/package.json
	public/node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_modules/xmlhttprequest/package.json
	public/node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/package.json
	public/node_modules/karma/node_modules/socket.io/package.json
	public/node_modules/karma/node_modules/useragent/node_modules/lru-cache/package.json
	public/node_modules/karma/node_modules/useragent/package.json
	public/node_modules/karma/package.json
	public/package.json
	public/test/karma.conf.js
	public/test/unit/controllersSpec.js
	public/test/unit/directivesSpec.js
	public/test/unit/filtersSpec.js
	public/test/unit/servicesSpec.js
resolve conflict