Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'front_end' into develop
Merge branch 'develop'
Change padding to margin
Initial view slide in/out animation
Reorder class methods
Cache the Activity.all
Merge branch 'back_end' into develop
Merge branch 'develop'
Merge branch 'develop' into front_end
Merge branch 'front_end' into bidi_view_animate
Move animations into mixins
Merge branch 'action_queue' of github.com:Fit-Track/fittrack into action_queue
Merge branch 'action_queue' into develop
Merge branch 'develop' into bidi_view_animate
Better flow control between views
Improve form styles (spacing)
Remove unused "notice" from detail page