Merge branch 'master' of https://github.com/ChapterBuilder/ChapterBuilder

Conflicts:
	app/invite_user.php
fix