;
Merge branch 'origin/master'

Conflicts:
	www/css/StyleSheet.css
	www/css/StyleSheetBig.css
	www/css/StyleSheetSmall.css
	www/index.html
	www/js/managers/Terms_Manager.js
	www/js/managers/Timer_Manager.js