trying to resolve our promises
ugh
fixing promise chain
Merge branch 'master' into feature
merging with master
Merge remote-tracking branch 'origin/master' into feature
Merge remote-tracking branch 'origin/master' into feature
starting on drag/drop image upload
undoing some silly stuff
Merge remote-tracking branch 'origin/master' into feature
ugh fixing tabs
adding first part of drag/drop directive. fixing upload service
fixing tabs in bower.json file
Merge branch 'master' into feature
further work on image uploading.  lots of refactoring/clean up to do
Merge branch 'master' into feature
further work on the modal.  doing some learnings. a bit of css
Merge branch 'master' into feature
cleaning up some stuff with the directives, adding some basic error handlings
merging things