pushing updates
Merge branch 'master' of https://github.com/CarlosSaltaren/tw-dashboard

Conflicts:
	lib/app.rb
Merge remote-tracking branch 'origin/master'