Merge branch 'master' into issue-5
Made some styling changes
Use links instead of buttons to go to other pages
Unneeded, on create we redirect to the activity or render new
Show errors when an activity cannot be created
Add feature that confirms errors are displayed when activity content isn't filled out
Merge branch 'issue-5' of github.com:nedap/internal-tweeter into issue-5
Merge branch 'master' into issue-6

Conflicts:
	app/models/activity.rb
	app/views/persons/index.html.erb