app update
Merge branch 'master' of github.com:singuerinc/singuerinc-boxen

Conflicts:
	modules/people/manifests/singuerinc/applications.pp