Pull from repository
Merge branch 'master' of https://github.com/ervy19/Project_TEAMS with local repo of Ervy

Conflicts:
	app/controllers/PositionsController.php
	app/views/positions/edit.blade.php
Update internal training views (General, Participants, After Activity Evaluation and Training Effectiveness Report)