updated locales
Merge branch 'master' into clean_student_views
WIP: fixed student show
WIP: student header
merged master
WIP: update bootstrap_v3
WIP: fixed class [span, row-fluid]
fixed conflicts & merged master
fixed conflicts & merged master
WIP
fixed top menu
fixed home
merged origin
Merge remote-tracking branch 'origin/master' into update_bootstrap_v3
WIP: fixing students#index
Merge remote-tracking branch 'origin' into update_bootstrap_v3
WIP: fixing students#index
fixed files
WIP
merged master