master 07.05.2014
master 07.05.2014
Merge branch 'dev'

Conflicts:
	index-test.php
master 07.05.2014