dj
Merge branch 'master' of github.com:joakimmj/Wapp

Conflicts:
	wapp/js/project_joakimmj.js