Commit Renhard

Commit Renhard
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/news.php
	application/controllers/profile.php
	application/views/attraction.php
	application/views/news.php
	application/views/newsForm.php
	application/views/profileForm.php