update
Merge branch 'master' of https://github.com/rubytobi/hilti2015

Conflicts:
	src/UI/UIProjectView.java