actuions updates
Merge branch 'master' of https://github.com/pauljdehmer/house

Conflicts:
	assets/scripts/actionsSettings.js