edit by sal
Merge branch 'master' of https://github.com/rcm-dev/talent_lounge_dev

Conflicts:
	chalk.php