Changed some gems group to development, remove add-timezone in app/assets/javascript
Merge branch 'hotfix/1.2.1'
Merge tag 'v1.2.1' into develop

Fix some minor issue