save before pulling upstream master
fix conflict - tabbing
add id='main-content' to div
add functions to support loading gif and display msg when success or error
update words
Merge pull request #10 from tihuan/feature_pull_info_via_js

Add loading status and messages after AJAX update