user authentication via tokens
Merge branch 'development' of https://github.com/circledigitalkenya/timbyweb into development

Conflicts:
	cms/wp-content/themes/timby/js/app.js