ignore appliction.confwq
i
Merge branch 'master' of https://github.com/silbermm/anchor-otr

Conflicts:
	conf/application.conf
Merge branch 'master' of https://github.com/silbermm/anchor-otr
Merge branch 'master' of https://github.com/silbermm/anchor-otr

Conflicts:
	conf/application.conf