Fix #764 - provision/docker: limit swap memory in containers
Fix small bug
Changed swap sum location
Merge branch 'add-support-to-custom-swap' of https://github.com/guestisp/tsuru

Conflicts:
	app/app.go
	app/app_test.go
	cmd/tsuru/apps.go
	cmd/tsuru/apps_test.go
fixed app tests.
Merge branch 'master' of github.com:tsuru/tsuru