RE INIT
Merge branch 'master' of github.com:Junzki/nmcwiki

Conflicts:
	conf/trac.ini
	db/trac.db