Merge remote-tracking branch 'remotes/origin/master' into weyland
Created seperate directive files.
Merge remote-tracking branch 'origin/master' into weyland

Conflicts:
	client/js/app.js
Le fix.
Merge branch 'weyland'