Refactored entire application - now using React/reflux
Merge resolution
Removed old angular service