Use unstable
Use $resource url property on action
Log arguments
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/index.html
Merge index.html