Merge remote-tracking branch 'upstream/development'
Updates Gemfile Bootstrap Timepicker
Updating Gemfile for Bootstrap Timepicker
Merge branch 'master' of https://github.com/raqibhakim/ogma
Merge remote-tracking branch 'upstream/development'
Creating New Pages for New Annual Training Budget
Delete Bower & Update Gemfile
Merge pull request #60 from raqibhakim/master

Delete Bower & Update Gemfile
Merge remote-tracking branch 'upstream/development'
update student info/tab/translation