no message
Merge commit '2ccaef4d621f1615ab13296b47e5c6585054ae53'

Conflicts:
	war/WEB-INF/classes/com/jaydi/ruby/apis/Users.class
	war/css/main.css
	war/index.html
	war/js/main.js