Merge origin/master

Conflicts:
	app/scripts/controllers/subject.js
	app/styles/subject.css
	app/views/subject.html
pøh
Merge origin/master
Merge origin/master
Merge origin/master

update: 
	subject.html
	subject.css
	subject.js
Merge origin/master

update: 
	subject.html
	subject.css
	subject.js
Merge origin/master

Conflicts:
	app/styles/footer.css
Merge origin/master