Merge branch 'release-1' of https://github.com/festivit/festivit into release-1
reverted to a working layout
resolved a merge conflict, please god let this be the last one
Merge pull request #39 from obeid/release-1

layout working now
stash
 fixed conflicts
major changes unrealized
fixed role type, again. updated forms.
Merge pull request #40 from jcward10/participants

Participants
search from with scopes working
landing page prototype with transparent top bar
Merge branch 'release-1' of https://github.com/festivit/festivit into release-1
landing page
 application updates
Merge pull request #41 from jcward10/release-1

update applications
Search and scopes working
Moved search to index method. Results on scopes are now ordered
cleaned the application html and css
Working importer. Populates 4 associated tables: participants, tickets, ticket_types fests.
merge conflicts