master 07.05.2014
Merge branch 'dev'

Conflicts:
	index-test.php
master 07.05.2014
master 11.05.2014
Merge remote-tracking branch 'origin/master'

Conflicts:
	index-test.php
master 11.05.2014