Fix Patterns for .gitattributes to correctly ignore libraries
Apply .gitattributes
Merge branch 'customization' into integration

Conflicts:
	src/main/webapp/app/proxy/RestProxy.js
	src/main/webapp/app/view/LoginPanel.js
	src/main/webapp/app/view/MatrixButton.js
	src/main/webapp/app/view/Question.js
	src/main/webapp/app/view/TabPanel.js
	src/main/webapp/app/view/about/TabPanel.js
	src/main/webapp/app/view/feedback/AskPanel.js
	src/main/webapp/app/view/home/MySessionsPanel.js
	src/main/webapp/app/view/speaker/InClass.js
	src/main/webapp/app/view/speaker/NewQuestionPanel.js
	src/main/webapp/app/view/speaker/QuestionStatisticChart.js
	src/main/webapp/app/view/speaker/form/ExpandingAnswerForm.js
	src/main/webapp/app/view/user/InClass.js
Merge branch 'socket.io-1.0' into integration

Conflicts:
	src/main/webapp/app/proxy/RestProxy.js
	src/main/webapp/lib/socket.io/socket.io.min.js
Merge branch 'skillquestion-image' into integration

Conflicts:
	src/main/webapp/app/view/speaker/NewQuestionPanel.js
Hide learning progress components if feature is disabled by config
Fix correct answer count on grid square form
Merge branch 'lp-optional' into integration
Apply .gitattributes
Apply .gitattributes
startkonfiguration für gridcontainer auf 16x16 gestellt
highlighting-farbe auf gelb gestellt
reihenfolge der statistik-aktionen angepasst
Hintergrundfarbe des Canvas kann jetzt getoggelt werden (weiß - transparent). DB-Anbindung fehlt noch.
toggle für Background Color wird jetzt in DB abgespeichert, geladen.
isColored Flag wird resettet. Fehler im toggle Button korrigiert.
grid positions are now computed relative
grid positions are now computed relative
Grid movement is now also computed relatively
LKT is now labeled as +-