added notices, alert and headers to all slim views
fixed merge conflicts
made all view slim with alert and notices and merged
Merge branch 'release-1' of github.com:festivit/festivit into everynew
fixed team page names issue
fixed merge conflict
fixed merge conflicts
Merge pull request #101 from obeid/release-1

fixed a whole lot of issues in team page and different views
Fix merge in user show
removed compiled assets
change from email
Fix heroku problems
add one more dropbox setting
modify secrets file
Modify dropbox variables
Modify dropbox variables