Merge remote-tracking branch 'remotes/upstream/1.0-beta'

Conflicts:
	.travis.yml
	Gruntfile.js
	README.md
	bower.json
	config/karma-sauce.conf.js
	config/protractor.conf.js
	js/_license.js
	js/ext/angular/src/controller/ionicScrollController.js
	js/ext/angular/src/directive/ionicActionSheet.js
	js/ext/angular/src/directive/ionicBar.js
	js/ext/angular/src/directive/ionicCheckbox.js
	js/ext/angular/src/directive/ionicContent.js
	js/ext/angular/src/directive/ionicList.js
	js/ext/angular/src/directive/ionicLoading.js
	js/ext/angular/src/directive/ionicRadio.js
	js/ext/angular/src/directive/ionicScroll.js
	js/ext/angular/src/directive/ionicSideMenu.js
	js/ext/angular/src/directive/ionicSlideBox.js
	js/ext/angular/src/directive/ionicTabBar.js
	js/ext/angular/src/directive/ionicToggle.js
	js/ext/angular/src/directive/ionicTouch.js
	js/ext/angular/src/directive/ionicViewState.js
	js/ext/angular/src/ionicAngular.js
	js/ext/angular/src/service/delegates/ionicScrollDelegate.js
	js/ext/angular/src/service/delegates/ionicSideMenuDelegate.js
	js/ext/angular/src/service/ionicActionSheet.js
	js/ext/angular/src/service/ionicBind.js
	js/ext/angular/src/service/ionicLoading.js
	js/ext/angular/src/service/ionicModal.js
	js/ext/angular/src/service/ionicView.js
	js/ext/angular/test/controller/ionicScrollController.unit.js
	js/ext/angular/test/directive/ionicSideMenu.unit.js
	js/ext/angular/test/directive/ionicTabBar.unit.js
	js/ext/angular/test/directive/ionicToggle.unit.js
	js/ext/angular/test/directive/ionicView.unit.js
	js/ext/angular/test/list-fit.html
	js/ext/angular/test/list.html
	js/ext/angular/test/modal.html
	js/ext/angular/test/service/delegates/sideMenuDelegate.unit.js
	js/ext/angular/test/service/ionicActionSheet.unit.js
	js/ext/angular/test/service/ionicModal.unit.js
	js/ext/angular/test/service/ionicPlatform.unit.js
	js/ext/angular/test/sideMenu.html
	js/ext/angular/test/sideMenu2.html
	js/ext/angular/test/toggle.html
	js/ext/angular/test/viewState.html
	js/utils/dom.js
	js/utils/gestures.js
	js/utils/platform.js
	js/utils/poly.js
	js/views/headerBarView.js
	js/views/listView.js
	js/views/popupView.js
	js/views/scrollView.js
	js/views/sideMenuView.js
	package.json
	release/js/ionic-angular.min.js
	release/js/ionic.bundle.min.js
	release/version.json
	scripts/release/finalize-version.sh
	scripts/travis/ci.sh
	scss/_action-sheet.scss
	scss/_animations.scss
	scss/_bar.scss
	scss/_button.scss
	scss/_form.scss
	scss/_items.scss
	scss/_menu.scss
	scss/_mixins.scss
	scss/_scaffolding.scss
	scss/_variables.scss
	test/e2e/viewState/test.html
	test/e2e/viewState/test.js
	test/html/footers.html
	test/html/input-toggle.html
Add files
Add files