Merge branch 'development'
Added installation instructions.
Added travis badge
Merge remote-tracking branch 'origin/development' into development
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into development
Changed some arrays to the new syntax