change angular conflict resolution
add grunt and browser support
fix grunt serve
try with firefox instead of chrome
add firefox to test unit too
store pid server and kill it
fix
add singleRun
trying with phantomjs :/
with karma
Merge pull request #1 from M6Web/fix-travis

change angular conflict resolution