data integration start
Merge branch 'master' of https://github.com/somewebdevteam/wth

Conflicts:
	public/javascripts/app.js