compiling version
Merge branch 'master' into categorys
another commit
project files
Merge branch 'master' into categorys
Merge branch 'master' of https://github.com/StefanTischler/Hugo.git
Merge branch 'master' of https://github.com/StefanTischler/Hugo.git

Conflicts:
	HugoTest/src/at/tugraz/mobilforum/test/MainActTest.java