Merge branch 'master' into develop
Modified build script
Update app.config
Merge branch 'develop' of github.com:yuilop/jinglenodes into develop
Merge branch 'release/1.1.0b'
Merge branch 'master' of github.com:yuilop/jinglenodes

Conflicts:
	debian/postinst.tail