Renaming done.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.zfproject.xml
	application/controllers/IndexController.php
MERGING HITS THE FAN ONCE AGAIN