added loading class
fixed merge conflicts
Merge pull request #36 from massiveart/feature/loading

Feature/loading