Merge branch 'release/20140115'
Merge tag '20140115' into develop

base angular working