Merge branch 'iris-grunt' of https://github.com/iris-js/iris into iris-grunt
Fixed urlContains method
Merge branch 'iris-grunt' of https://github.com/iris-js/iris into iris-grunt
Merge branch 'iris-grunt' of https://github.com/iris-js/iris into iris-grunt
esolve conflicts
Merge branch 'iris-grunt' of https://github.com/surtich/iris into iris-grunt