Merge urigo/ngMeteor v0.2