update font awesome 4 and bootstrap 3.1.1
Merge branch 'master' of https://github.com/razvan-tudosie/FusionInvoice

Conflicts:
	public/assets/css/fonts/font-awesome/font-awesome-ie7.css
	public/assets/css/style.css
	public/assets/sass/screen.scss