Refactoring the grid some more
Working on the homepage tempates and SCSS some more
Finalizing the color schemes
Worked on refining the alerts and dropdown schemes.
Working on the file upload form
Working on the file forms and views
Update _form_fields.html.haml

for the merge into develop
Merging Grid into Develop