remove white space
Merge remote-tracking branch 'origin/master'

Conflicts:
	.htaccess
	application/controllers/application.php
	nbproject/private/private.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.htaccess
	application/controllers/application.php
	nbproject/private/private.xml