Merge bp323/bootstrap3 into favicon and fix conflicts
Update tinycon.js to 0.6.3
Merge branch 'favicon' of https://github.com/bp323/3akai-ux into favicon
Tinycon follow-up
Self review for Tinycon