change http to protocol independent stuff
Merge branch 'develop' of github.com:noproblan/npl-website into develop
replaced tabs in our own code with 4 spaces (like in the zend framework 1 coding guidelines)
do not commit galleries
Added short info on manual setup
Corrected copyright info
Merge branch 'refs/heads/develop' into feature/2

Conflicts:
	admin/layouts/scripts/layout.phtml
	application/controllers/NewsController.php