Add composer.lock and *.log
Add composer.json
Add vagrant init files
Baseic Puppet manifest
Merge
squeezebox
New key system for jwplayer pro
Merge branch 'development' of https://github.com/Joomla-Bible-Study/Joomla-Bible-Study into jbsm_jwp
some new options for jwplayer. still need to add code to media helper.
Merge branch 'development' of https://github.com/Joomla-Bible-Study/Joomla-Bible-Study into jbsm_jwp
Removing elements helper.
Implement Server addons
Merge branch 'development' of https://github.com/Joomla-Bible-Study/Joomla-Bible-Study into development
Merge branch 'development' of https://github.com/Joomla-Bible-Study/Joomla-Bible-Study into development

# By Brent Cordis (7) and Tom Fuller (7)
# Via Brent Cordis
* 'development' of https://github.com/Joomla-Bible-Study/Joomla-Bible-Study:
  Removing elements helper.
  Added urlencoding to links to study details. It was causing podcast to fail validation.
  Add some missing Doc info.
  Close #325 Fixes missing JLoader for dphelper.php
  Added image dimensions to podcast image, removed description from podcast list because it made the page too long.
  Just testing to make sure article worked.
  Corrected problem with docMan_id. In old schema it was numeric so it was set to zero. In new schema it is a VARCHAR. Changed the test to isset($docMan_id) but that will be true even if it is a zero. So added a test to make sure it is not zero.
  Built new packages just to test. Fixed problem with media where Itemid was not gotten correctly. Still major problem with this file though so will still work on it.
  Finished All In One for teacher links. Works for teacher list or individual teacher.
  Starting work on an all in one row for teacher links. Not done yet.
  Clean up code and update functions.
  Missing sql updates.
  Close as i can get it now till eugen can work on fixing the server selection for j3.2
  missing jfolder jimport.

Conflicts:
	com_biblestudy/admin/models/server.php
	com_biblestudy/admin/models/servers.php
Merge pull request #327 from genu/development

Implemented Servers as addons
Commit fix
Merge branch 'development' of https://github.com/Joomla-Bible-Study/Joomla-Bible-Study into development

# Via tomfuller2
* 'development' of https://github.com/Joomla-Bible-Study/Joomla-Bible-Study:
Merge pull request #328 from genu/development

Development
Fix servertype
Merge pull request #329 from genu/development

Fix servertype