karma.conf.js fixed for Angular 1.2.1
Merge pull request #23 from ChristophT/master

main-test.js fixed for Angular 1.2.1