Don't push automaticly.
Basic configuration for Karma, don't work actualy need to search why.
Basic configuration for Protractor.
save
add karma & protractor conf and fixed first tests
add blocking-multi-shell
Add the updated_at.
The conflict verification is now done server side.
save.
delete log and clean a little bit.
Clean.
Use one value instead of multiple and start making a detector for the database.
Merge branch '0.1-ConflictModification' into 0.1
Start a little bit e2e testing.
Merge branch '0.1-Testing' into 0.1

Conflicts:
	kanso.json
Correct error of conflict.