Merge branch 'release/0.1.4' into develop
Added settings tab.
Added settings tab.
Merge branch 'develop' of tg4.afb-studio.com:abstrakt/nopar into develop

Conflicts:
	lib/settings.js
	views/settings.ejs
Bumbed version to 0.1.5
Merge branch 'release/0.1.5'