no message
no message
no message
Merge branch 'master' of https://github.com/jaydi/Ruby-appengine

Conflicts:
	war/WEB-INF/classes/com/jaydi/ruby/apis/Rubymines.class
	war/WEB-INF/classes/com/jaydi/ruby/constants/Constants.class
	war/WEB-INF/classes/com/jaydi/ruby/models/Rubymine.class
	war/WEB-INF/classes/com/jaydi/ruby/models/User.class
	war/WEB-INF/rubymine-v1.api