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 'jruby-1.7' into java7

Conflicts:
	Info.plist
	Rakefile
	build_configuration.rb
	src/compile_version.rb