Merge origin/master

Conflicts:
	install/db_install.php
	views/index.php