fix for osx with java7
Merge branch 'master' of https://github.com/KKBOX/FireApp

Conflicts:
	src/compile_version.rb