Merge remote branch 'refs/remotes/dgrijalva/stable' into experimental

Conflicts:
	ApplicationController.m
	GitX.xcodeproj/project.pbxproj
	PBGitCommitView.xib
	PBGitHistoryView.xib
	PBGitRevisionCell.m
	PBGitTree.m
	PBGitWindowController.m
	PBViewController.m
	html/views/history/history.js
	html/views/history/index.html

PBViewController.m

@@ -37,18 +37,22 @@
 {
 }
 
-// This is called when the view is displayed again; it 
-// should be updated to show the most recent information
-- (void) updateView
+- (NSResponder *)firstResponder;
 {
+	return nil;
 }
 
 - (IBAction) refresh: sender
 {
 }
 
-- (NSResponder *)firstResponder;
+// The next methods should be implemented in the subclass if necessary
+- (void)updateView
 {
-	return nil;
 }
+
+- (void)viewLoaded
+{
+}
+
 @end