Tan set update
Merge branch 'master' of https://github.com/diegosanchez/angular

Conflicts:
	tabbed_view/index.html
	tabbed_view/tab_set.html
	tabbed_view/tab_set.js