MEAN.io Initial Setup - Finalized
Merging Conflictions