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

Coenego/avocet-ui,Coenego/avocet-ui,stuartf/3akai-ux,nicolaasmatthijs/3akai-ux,Orodan/3akai-ux-jitsi-fork,Orodan/3akai-ux-jitsi-fork,jfederico/3akai-ux,mrvisser/3akai-ux,stuartf/3akai-ux,simong/3akai-ux,Orodan/3akai-ux-jitsi-fork,mrvisser/3akai-ux,nicolaasmatthijs/3akai-ux,simong/3akai-ux,simong/3akai-ux,timdegroote/3akai-ux,timdegroote/3akai-ux,Orodan/3akai-ux,timdegroote/3akai-ux,jfederico/3akai-ux,nicolaasmatthijs/3akai-ux,Orodan/3akai-ux,mrvisser/3akai-ux,jfederico/3akai-ux,stuartf/3akai-ux,Orodan/3akai-ux