Merge branch 'master' of https://github.com/driftyco/ionic

Conflicts:
	dist/ionic-simple.js
	dist/ionic.js

js/controllers/viewController.js

@@ -0,0 +1,14 @@
+(function(ionic) {
+  ionic.ViewController = function(options) {
+    this.init();
+  };
+
+  ionic.ViewController.prototype = {
+    // Initialize this view controller
+    init: function() {
+    },
+    // Destroy this view controller, including all child views
+    destroy: function() {
+    }
+  };
+})(window.ionic);