Revert:
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
	src/main/webapp/WEB-INF/sitemesh3.xml
	src/main/webapp/WEB-INF/views/index.jsp
	src/main/webapp/WEB-INF/views/play.jsp
	src/main/webapp/decorator/index.jsp
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/build/myLib/bootstrap/v3/css/bootstrap-theme.css
	src/main/webapp/build/myLib/bootstrap/v3/css/bootstrap-theme.min.css
	src/main/webapp/build/myLib/bootstrap/v3/css/bootstrap.min.css
	src/main/webapp/build/myLib/bootstrap/v3/js/bootstrap.min.js
	src/main/webapp/build/myLib/jquery/plugins/scrollup-master/CHANGELOG.md
	src/main/webapp/build/myLib/jquery/plugins/scrollup-master/CONTRIBUTE.md
	src/main/webapp/build/myLib/jquery/plugins/scrollup-master/README.md
	src/main/webapp/build/myLib/jquery/plugins/scrollup-master/index.html
	src/main/webapp/build/myLib/jquery/plugins/scrollup-master/js/jquery.scrollUp.js
	src/main/webapp/build/myLib/jquery/plugins/scrollup-master/package.json
	src/main/webapp/build/myLib/jquery/plugins/scrollup-master/src/jquery.scrollUp.js
	src/main/webapp/build/resources/css/app.css
	src/main/webapp/build/resources/js/active.js
	src/main/webapp/build/resources/js/app.js
	src/main/webapp/build/resources/js/bind.js
	src/main/webapp/build/resources/js/chat.js
	src/main/webapp/build/resources/js/index.js
	src/main/webapp/build/resources/js/play.js
	src/main/webapp/build/resources/js/profile.js
	src/main/webapp/build/resources/js/search.js
	src/main/webapp/build/resources/js/signin.js
	src/main/webapp/build/resources/js/signup.js
	src/main/webapp/build/resources/js/upload.js
	src/main/webapp/resources/js/signup.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
	src/main/webapp/WEB-INF/sitemesh3.xml
	src/main/webapp/WEB-INF/views/index.jsp
	src/main/webapp/WEB-INF/views/play.jsp
	src/main/webapp/decorator/index.jsp