Starting to add swagger markup
Merge branch 'master' of github.com:Castcloud/Castcloud
More swagger
Merge branch 'master' of github.com:Castcloud/Castcloud
s/tolken/token
Merged some stuff
Mo Swagger
Merge branch 'master' of github.com:Castcloud/Castcloud
More or less complete swagger
Merge branch 'master' of github.com:Castcloud/Castcloud

Tag merge
Merge branch 'master' of https://github.com/Castcloud/Castcloud

Conflicts:
	api/index.php
Merge branch 'master' of github.com:Castcloud/Castcloud

merge tag
Added timestamp to get events, and more info on filters
Merge branch 'master' of github.com:Castcloud/Castcloud
Merge branch 'master' of github.com:Castcloud/Castcloud
Merge branch 'master' of github.com:Castcloud/Castcloud
Merge branch 'master' of github.com:Castcloud/Castcloud

trying merge omg
Merge branch 'master' of github.com:Castcloud/Castcloud

Conflicts:
	management/index.php
Started work on making models
Merge branch 'master' of github.com:Castcloud/Castcloud