Client side ember app require support
Remove spam
Working application route using ember and requirejs together
Merge remote-tracking branch 'upstream/master'

Conflicts:
	public/app/lib.js