Merge tag '20140528052642-HOTFIX' into hotfix/trial

milestone: 20140528052642-HOTFIX 20140528052642-HOTFIX
Merge pull request #4 from skangayam/hotfix/trial

Merge tag '20140528052642-HOTFIX' into hotfix/trial
Merge pull request #5 from skangayam/develop

Develop
Merge branch 'release/20140528055510'
Merge tag '20140528055510' into develop

milestone: 20140528055510 20140528055510