Merge pull request #1 from pencilblue/master

Update from original
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Performance Improvement for retrieving author data
Add romanian translation
Merge branch 'master' of github.com:tic2000/pencilblue
Add romanian translation
Merge branch 'ro' of github.com:tic2000/pencilblue into ro
Merge pull request #382 from tic2000/ro

Romanian translation
fixed angular error on email settings
Merge pull request #385 from pencilblue/PB381

fixed angular error on email settings
#386 saved settings loaded properly
Merge pull request #387 from pencilblue/PB386

#386 saved settings loaded properly
removed console logging
Merge branch 'master' into story/REMOVE_PROMISES