Edit Home Page
Merge remote-tracking branch 'origin/development' into albert
Add badge
Merge remote-tracking branch 'origin/development' into albert

Conflicts:
	application/views/homepage/body.php
	style/style_new.css