Current state
Merge branch 'master' into develop

* master:
  Current state

Conflicts:
	.gitignore
	view/design/design.css
	view/design/foot.html
	view/design/play.png
	view/design/share1.png
	view/design/video.jpg
	view/download.php
	view/findimage.php
	view/getimage.php
	view/pages/image.php
	view/pages/slideshow.php
	view/phpfunctions.php
	view/update.php