ignore /public/private folder ( for install-specific js )
set markdown package to stable version
Merge branch 'issue171'

Conflicts:
	app/models/User.php
	composer.json
remove references to user_level
add browsehappy prompt
add ng-app id required for ie
Merge branch 'master' into issue171

Conflicts:
	app/models/User.php
	composer.json