Upping to latest stable Jasmine
Merge branch 'integration'
Disabling unused launchers
Hoping I got the Travis docs correct, doubting the yml/json mixup...
RTFM...
Merge branch 'feature-travis_ci'

# By martin-spil-reurings
# Via martin-spil-reurings
* feature-travis_ci:
  RTFM...
  Hoping I got the Travis docs correct, doubting the yml/json mixup...
  Disabling unused launchers
Build-status icon :)
Limit CI to Phantom only, perhaps I'll add others later, but phantom is enough for now...
Merge branch 'master' of https://github.com/windgazer/app5upport

Conflicts:
	test/jasmine
Had not properly removed jasmine subrepo it appears
Had not properly removed jasmine subrepo it appears
Porting my fastbutton implementation
Adding my Resolutions calculator script
Script stems from way before I did unit-testing, added todo :)
Merge branch 'feature-userInteraction'
version bump
Merge commit '22bddb0c469fce37d9eed036264e2a8d28e9b3a8' into integration