Merge pull request #1 from HackerspaceBremen/dev

Dev to master
Merge pull request #2 from HackerspaceBremen/dev

Dev to master
Update rightside.php
Update index.php
changed atom url
connected website with google+
added twitter link
changed link for events
Update rightside.php
Update README.md
Update README.md
Merge branch 'dev' of github.com:HackerspaceBremen/hshb_website into dev

Conflicts:
	basicPhps/header.php
	basicPhps/leftside.php
	basicPhps/rightside.php
Update newsletter_and_mailinglist.php
Merge pull request #5 from HackerspaceBremen/dev

Dev
Update rightside.php

Updates dates
Update rightside.php

updated dates #2
Merge branch 'master' of github.com:HackerspaceBremen/hshb_website

Conflicts:
	basicPhps/rightside.php
Merge branch 'master' into dev

Conflicts:
	basicPhps/rightside.php