Basic styling

Added some images and began with styling.
Merge branch 'master' into front-end
Some advances with the front end
New styles added
Update CSS
Merge branch 'master' into front-end
Add updated gemfile.lock
Add discuss css
Merge branch 'master' into front-end
Update proposals form to add new fields
Add correct magma logo
this is the correct  magma logo
Remove unused line from proposal view
2012 to 2013
Date formatting
The show proposal view
Highlight form errors
Temporary better MagmaConf logo
Add email to profile