Put jre7 on classpath
Merge branch 'master' of ssh://git@github.com/wadinj/ActionProject.git

Conflicts:
	ActionProject/.classpath