Merge origin/master

Conflicts:
	Library/Helpers/Page.php
	Resources/StyleSheet/Project_StyleSheet.css