Merge branch 'develop' into codeviewer-master
codeviewer.css syntax error fixed
The numberlines extrabox just for less code.

The numberlines extrabox just shows for samller codeexample.
Fixed a bug with changing contenteditable

It should now be possible to edit content on the desktop site on mobile
devices
Merge branch 'codeviewer-master' of https://github.com/HGustavs/LenaSYS_2014 into codeviewer-master

Conflicts:
	CodeViewer/js/codeviewer.js
Fixed "Desktop site" button
Linerows buggfix #404
set height and width on textarea addstudent
Merge branch 'codeviewer-master' into develop
Merge remote-tracking branch 'origin/codeviewer-master' into develop
Merge branch 'duggasys-master' into develop