Added tags as attribute to activityResult
Save tags with activityResult
Show Tags Input on notFound page
Incorporated tags in edit_photo view
Always initialize arrays of ActivityResult model
Removed berlin :-P
Removed merge files
Merge remote-tracking branch 'upstream/master' into feature/CustomTagsForActivityResults

Conflicts:
	lib/activityresults/activityresult.js
Merge pull request #793 from rradczewski/feature/CustomTagsForActivityResults

Feature/custom tags for activity results