Updated the bootstrap 2 template to 2.3.2 and font awesome 3.2.1
fix conflicts