Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	local.properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	htdocs/database/database.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	htdocs/database/database.php