Flip Settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/directives/sv-home-panel.html
dd
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/directives/sv-home-panel.html
	app/views/directives/sv-home-panel.jade
Flip Settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/home.html
	app/views/home.jade
Flip Settings