settings,dump
settings, dump
Merge branch 'dev2' of https://github.com/andreaspfurtscheller/cube into dev2
stuff
Merge branch 'dev2' of https://github.com/andreaspfurtscheller/cube into dev2
stuff
Merge branch 'master' into dev2

Conflicts:
	settings/index.php