Merge pull request #36 from jsyeo/jason-dev

Add progress bar for image uploads
Fix indent outdent buttons