Merge branch 'master' into development
Toan & Nikesh | Removed pre-compiled assets
Merge branch 'development'