Readme updated
Update with Travis-CI enabled
Update for Travis-CI
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
	learn-lms-core/src/main/scala/com/arcusys/scorm/lms/CourseService.scala
	learn-persistence/src/main/resources/sql/scormbase/Course.sql
	learn-persistence/src/main/resources/sql/scormbase/Course_insert.sql
	learn-persistence/src/main/resources/sql/scormbase/Course_renew.sql
	learn-persistence/src/main/resources/sql/scormbase/Course_update.sql
	learn-persistence/src/main/resources/sql/scormbase/PackageScopeRule_renew.sql
	learn-persistence/src/main/resources/sql/scormbase/PlayerScopeRule.sql
	learn-persistence/src/main/resources/sql/scormbase/PlayerScopeRule_insert.sql
	learn-persistence/src/main/resources/sql/scormbase/PlayerScopeRule_renew.sql
	learn-persistence/src/main/resources/sql/scormbase/PlayerScopeRule_update.sql
	learn-scorm-package-model/src/main/scala/com/arcusys/learn/scorm/manifest/model/PlayerScopeRule.scala
	learn-scorm-package-model/src/main/scala/com/arcusys/learn/scorm/manifest/model/ScopeType.scala
	learn-web/src/main/webapp/SCORMData/SCORM.trace.db
	learn-web/src/main/webapp/i18n/error_en.properties
	learn-web/src/main/webapp/js/player/SettingsView.js
	learn-web/src/main/webapp/player_settings.html
	learn-web/src/main/webapp/scorm_nopermissions.html
	learn-web/src/main/webapp/templates/player_settings_templates.html
Readme updated to show Travis CI status
Travis CI updated to support PostgreSQL and MySQL
Merge pull request #25 from ViLPy/master

Update for Travis-CI