function added
Merged 'develop'.

Conflicts:
	index.php
Finish Feature-1