ignore db.php
Merge branch 'feature-portal' into development
update FontAwesome to 3.2.1