Merge branch 'master' into bootstrap3
Merge branch 'bootstrap3' of https://github.com/oaeproject/3akai-ux into bootstrap3