Merge from dev
Merge total_fare and rake mod from develop
Merge from dev for deploy
Deploy merge
Revert rake task merge
Merge refactor of stat
Deploy fragment cache
Merge branch 'develop'
Merge from develop
Merge develop
Merge develop
Add route to display error messages for unauth user
Merge from master