Fix Angular version conflict in Bower.
Work around UI Router bug.
Merge branch 'next-release'
3.6.0