User pop out working!
Merge branch 'dev' of https://github.com/FitroApp/Kiwi into dev

Conflicts:
	public/css/app.css