added echosen aliases
Merge branch 'master' of github.com:phundament/app

Conflicts:
	config/main.php