updated castle charge
added virtue cross
Added resolutions page
Merge branch 'hotfix/AddMeetingNotes23Oct2014'
Merge branch 'master' into develop
fixed database connection
added item on FAQ page to meeting minutes
fixed typo in amber's name
fixed comparator route
Merge branch 'hotfix/FixHomeRoute'
Merge branch 'master' into develop
fixed link to generator from profile page
Merge branch 'hotfix/FixAvatarCreationRedirectForNewUsers'
Merge branch 'master' into develop