fixed position
Merge branch 'master' into bootstrap3