styling about and card
fix merge conflict in progress bar
Merge branch 'master' of github.com:danielabar/flashlang