test
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team3

Conflicts:
	WordFinder/bin/classes/ch/unibe/scg/team3/wordfinder/HomeActivity.class
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team3