fred_7_25
7.25W
Header vereinheitlicht; Javascript angepasst;
fred 7_25
Zurück zur Basisseite funktioniert wieder
merged with master
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
fixed failing tests
fixed error in phpunit test
prepared_statements angepasst
set file permissions for recursive folders (init.py); fixed languageSelect test; make use of relative links for screenshots (BaseTest.java)
small fix
changed pootle url to fix language test on jenkins
updated selenium to 2.32.0
7.97W bugfix: wrong auth token stored in db when PW is updated
kleinere Änderungen an Sqls
Merge branch 'master' of github.com:Catrobat/Catroweb