Update OS Training to OSTraining
Update copyright year to 2014
Add composer.json and update the update url
Merge branch 'master' of github.com:OSTraining/com_oscontent

Conflicts:
	README.md
	src/oscontent.xml