started refactoring of settings and setup
Merge branch '2.0.0' of github.com:svenkubiak/Rudeltippen into 2.0.0

Conflicts:
	app/controllers/Admin.java
	app/controllers/System.java
	app/models/User.java