1.2.30

Bugfixes and some improvements
Merge remote-tracking branch 'origin/master'

Conflicts:
	admin/js/nwm-admin.js