fred_7_25
7.25W
Header vereinheitlicht; Javascript angepasst;
fred 7_25
Zurück zur Basisseite funktioniert wieder
merged with master
bug 7.91W: fixed device auth token not updated when PW is reseted.
Merge branch 'master' of github.com:Catrobat/Catroweb
fixed typo
removed logo from QR code
updated help file
7.12W: Description kann mit Urls umgehen
Merge branch 'master' into fred_7_25

Conflicts:
	addons/board/cache/data_bots.php
	addons/board/cache/data_hooks.php
	include/css/header.css
	include/script/headerMenu.js
	include/script/index.js
	include/script/menu.js
	include/script/newestProjects.js
	include/script/passwordRecovery.js
	include/script/projectDetails.js
	include/script/registration.js
	include/script/searchProjects.js
	modules/catroid/details.php
	modules/catroid/index.php
	tests/phpunit/framework/commonFunctionsTest.php
	tests/selenium-grid/src/at/tugraz/ist/catroweb/catroid/DetailsTests.java
	tests/selenium-grid/src/at/tugraz/ist/catroweb/catroid/SearchTests.java
	viewer/catroid/details.php
	viewer/catroid/htmlHeaderTemplate.php
	viewer/catroid/htmlIndexHeaderTemplate.php
	viewer/catroid/htmlLoginHeaderTemplate.php
	viewer/catroid/htmlMenuHeaderTemplate.php
merge fehler ausgebessert
removed moved license texts; updated remaining license texts
first steps for the new project view
Merge branch 'master' into design

Conflicts:
	include/css/header.css
	include/xml/lang/en/catroid/imprint.xml
	modules/catroid/details.php
	modules/catroid/index.php
	viewer/catroid/copyrightpolicy.php
	viewer/catroid/details.php
	viewer/catroid/htmlFooterTemplate.php
	viewer/catroid/htmlHeaderTemplate.php
	viewer/catroid/htmlIndexHeaderTemplate.php
	viewer/catroid/htmlLoginHeaderTemplate.php
	viewer/catroid/htmlMenuHeaderTemplate.php
	viewer/catroid/imprint.php
	viewer/catroid/license.php
	viewer/catroid/licenseadditionalterm.php
	viewer/catroid/licenseofuploadedprojects.php
	viewer/catroid/privacypolicy.php
	viewer/catroid/termsofservice.php