Merge pull request #1 from robert-ruszala/develop

Develop
master
Merge branch 'develop'

* develop:
  develop changed
  develop
  Update index.php

Conflicts:
	index.php
master after tags
task-1 finished