jvm target 1.7, osx package use http://java.net/projects/appbundler/
add appbundler source code
fix osx app library path
Merge branch 'java7' of 192.168.123.18:/home/tka/Project/Compass/FireApp into java7
Merge branch 'java7' into jruby-1.7

Conflicts:
	Info.plist
	bin/startJar-osx.sh
	src/compile_version.rb
	src/main.rb
upgrade jruby to 1.7.2
Merge branch 'master' into jruby-1.7 and upgrade jruby to 1.7.3

Conflicts:
	lib/java/jruby-complete.jar
	src/compile_version.rb
	src/main.rb
Merge branch 'master' into jruby-1.7

Conflicts:
	Rakefile
	build_configuration.rb
	src/compile_version.rb
upgrade jruby to 1.7.4
Merge branch 'master' into java7

Conflicts:
	Info.plist
	Rakefile
	bin/startJar-osx.sh
	build_configuration.rb
	src/compile_version.rb
	src/main.rb
fix main.rb
Merge branch 'master' into java7

Conflicts:
	src/compile_version.rb
Merge branch 'jruby-1.7' into java7

Conflicts:
	Info.plist
	Rakefile
	build_configuration.rb
	src/compile_version.rb
Merge branch 'master' into jruby-1.7

Conflicts:
	README.markdown
upgrade jruby to 1.7.8
fix rurby version label
use jruby-1.7.8
upgrade to jruby 1.7.10
update serve submodule & fix simplehttpserver require order
Merge branch 'master' of https://github.com/handlino/FireApp