use jruby 1.7.10
Merge branch 'java7' of https://github.com/handlino/FireApp into java7

Conflicts:
	.ruby-version