Update Rails to 4.0.4
Change twitter bootstrap gem to bootstrap-sass
Update rails from 4.0.4 to 4.1.4
Display salary without AFP
Merge branch 'develop'
Add 1%, 5%, and 10% discount