Unsubscribe from app. ref 14873
Minor fix
Spec comment fix
Merge branch 'errbit' into feature/upstream_merge
Merge upstream
Remove return(false) from before_filter "require_watcher_edit_priviledges"
Merge branch 'errbit' into feature/upstream_merge
Merge branch 'mongoid-3' into pr/289

Conflicts:
	app/views/apps/show.html.haml
Fix spec and extract some string in translation
If the user not watch app. Not see the unwatch button
Fix the watcher destroy controller because not work before
Add Acceptance test to unwatch application
Merge pull request #289