remove something et
Merge branch 'master' of https://github.com/wabby/wabby-php

Conflicts:
	www/application/controllers/wabby.php