Merge pull request #110 from chrisshayan/Release12

Release12
Merge commit 'ce0f1595e15fc9138042710f8ffd5402a55d0694'
Fix bower issue
Merge commit '8f51ff999de321d92509e69ae9fe21d1574c3cdd'
Fix bower issue