change deploy method to use bower package
Merge branch 'feature/event_calendar' into develop
changed formum ordering in first page
Merge branch 'develop' into feature/event_calendar