Merge remote-tracking branch 'upstream/master'

Conflicts:
	.travis.yml
	CHANGELOG.md
	README.md
	bower.json
	component.json
	config/build.config.js
	demos/actionsheet/index.html
	demos/app-intro-walkthrough/index.html
	demos/checkbox/index.html
	demos/flickr-search-example/index.html
	demos/frosted-glass-effect/index.html
	demos/google-maps/index.html
	demos/lists/index.html
	demos/loading-bar/index.html
	demos/modal/index.html
	demos/popup/index.html
	demos/radio-buttons/index.html
	demos/shrinking-header/index.html
	demos/side-menu-and-navigation/index.html
	demos/sign-in-then-tabs/index.html
	demos/starter-template/index.html
	demos/swipeable-cards/index.html
	demos/tabs-and-navigation/index.html
	demos/thumbnail-list/index.html
	demos/toggle/index.html
	docs/processors/index-page.js
	docs/templates/api_menu_version.template.html
	gulpfile.js
	js/angular/controller/navBarController.js
	js/angular/controller/scrollController.js
	js/angular/controller/sideMenuController.js
	js/angular/controller/tabsController.js
	js/angular/directive/content.js
	js/angular/directive/headerFooterBar.js
	js/angular/directive/infiniteScroll.js
	js/angular/directive/item.js
	js/angular/directive/itemDeleteButton.js
	js/angular/directive/itemOptionButton.js
	js/angular/directive/itemReorderButton.js
	js/angular/directive/list.js
	js/angular/directive/menuToggle.js
	js/angular/directive/modal.js
	js/angular/directive/navBackButton.js
	js/angular/directive/navBar.js
	js/angular/directive/navButtons.js
	js/angular/directive/navClear.js
	js/angular/directive/navView.js
	js/angular/directive/ngClick.js
	js/angular/directive/radio.js
	js/angular/directive/refresher.js
	js/angular/directive/scroll.js
	js/angular/directive/slideBox.js
	js/angular/directive/tab.js
	js/angular/directive/tabNav.js
	js/angular/directive/tabs.js
	js/angular/directive/toggle.js
	js/angular/directive/touch.js
	js/angular/directive/view.js
	js/angular/main.js
	js/angular/service/actionSheet.js
	js/angular/service/backdrop.js
	js/angular/service/bind.js
	js/angular/service/delegateService.js
	js/angular/service/loading.js
	js/angular/service/modal.js
	js/angular/service/platform.js
	js/angular/service/popup.js
	js/angular/service/scrollDelegate.js
	js/angular/service/slideBoxDelegate.js
	js/angular/service/tabsDelegate.js
	js/angular/service/templateLoader.js
	js/angular/service/viewService.js
	js/ext/angular/test/actionSheet.html
	js/ext/angular/test/scroll.html
	js/ext/angular/test/viewState.html
	js/utils/activator.js
	js/utils/dom.js
	js/utils/events.js
	js/utils/keyboard.js
	js/utils/platform.js
	js/utils/poly.js
	js/utils/tap.js
	js/views/headerBarView.js
	js/views/listView.js
	js/views/scrollView.js
	package.json
	release/css/ionic.css
	release/css/ionic.min.css
	release/js/ionic-angular.js
	release/js/ionic-angular.min.js
	release/js/ionic.bundle.js
	release/js/ionic.bundle.min.js
	release/js/ionic.js
	release/js/ionic.min.js
	release/version.json
	scripts/travis/ci.sh
	scripts/travis/release-new-version.sh
	scss/_animations.scss
	scss/_bar.scss
	scss/_button.scss
	scss/_form.scss
	scss/_mixins.scss
	scss/_modal.scss
	scss/_platform.scss
	scss/_scaffolding.scss
	scss/_select.scss
	scss/_tabs.scss
	scss/_toggle.scss
	scss/_util.scss
	scss/_variables.scss
	test/css/input-toggle.html
	test/e2e/viewState/test.html
	test/e2e/viewState/test.html~HEAD
	test/html/actionsheet.html
	test/html/actionsheet.html~remotes_upstream_master
	test/html/clickTests.html
	test/html/input.html
	test/html/list-fit.html
	test/html/list.html
	test/html/loading.html~remotes_upstream_master
	test/html/modal.html
	test/html/scroll.html
	test/html/scroll.html~remotes_upstream_master
	test/html/sideMenu2.html
	test/html/tabs-repeat.html
	test/html/tapInputs.html
	test/html/toggle.html
	test/html/viewState.html
	test/unit/angular/controller/scrollController.unit.js
	test/unit/angular/directive/content.unit.js
	test/unit/angular/directive/headerFooterBar.unit.js
	test/unit/angular/directive/list.unit.js
	test/unit/angular/directive/navBackButton.unit.js
	test/unit/angular/directive/navBar.unit.js
	test/unit/angular/directive/refresher.unit.js
	test/unit/angular/directive/sideMenu.unit.js
	test/unit/angular/directive/slideBox.unit.js
	test/unit/angular/directive/tabs.unit.js
	test/unit/angular/directive/toggle.unit.js
	test/unit/angular/directive/view.unit.js
	test/unit/angular/service/delegateService.unit.js
	test/unit/angular/service/loading.unit.js
	test/unit/angular/service/modal.unit.js
	test/unit/angular/service/platform.unit.js
	test/unit/angular/service/popup.unit.js