fix conflict
Merge branch 'master' of git://github.com/xblaster/wadManager

Conflicts:
	conf/application.conf
Merge branch 'master' of git://github.com/xblaster/wadManager
Merge branch 'master' of git://github.com/xblaster/wadManager
Merge branch 'master' of git://github.com/xblaster/wadManager
Merge branch 'master' of git://github.com/xblaster/wadManager
Merge branch 'master' of git://github.com/xblaster/wadManager