#402

#402 - Ability to temporary disable responsive design
Merge branch 'codeviewer-master' of https://github.com/HGustavs/LenaSYS_2014 into codeviewer-master

Conflicts:
	CodeViewer/js/templates.js
Danger