Merge tag 'tagsmajorUpgrade' into develop

major more stable version of the code
Merge tag 'tagsdefaultQTY' into develop

default QTY on index page
Merge branch 'master' into develop
Merge tag 'tagsapplyTeamFunctionality' into develop

working teams
removed proken user object in the session code
major code reformat
Merge branch 'hotfix/formatCodeTeams'
Merge tag 'tagsformatCodeTeams' into develop

major code reformat after team implementation

Conflicts:
	MVC/controller/userController.php
added team functionality and permissions to menu items
database changes
improved user edit pages
test/sample config file
minimum database stuff to get started
added list users and default team stuff
Merge branch 'feature/createDefaultTeam' into develop
changed the unit from text box to a dropdown
implemented a lot of functionality! list add/ edit for the dropdowns and dispaly template for the dropdown options are now being saved in the databsae
major feature add and permissions upgrade
bump version number
Merge branch 'release/upgrade.1.0.1'