Merged with local changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	war/WEB-INF/appengine-generated/datastore-indexes-auto.xml
	war/WEB-INF/questionendpoint-v1.api
	war/WEB-INF/questionsetendpoint-v1.api
	war/WEB-INF/responseendpoint-v1.api
	war/WEB-INF/userendpoint-v1.api
clean up
Merge branch 'master' of ssh://github.com/rongjc/icreate

Conflicts:
	.settings/com.google.appengine.eclipse.core.prefs
	.settings/org.eclipse.jdt.core.prefs
	war/WEB-INF/appengine-generated/datastore-indexes-auto.xml
	war/WEB-INF/index.html
	war/WEB-INF/web.xml
	war/frontEnd/app/.buildignore
	war/frontEnd/app/.htaccess
	war/frontEnd/app/404.html
	war/frontEnd/app/bower_components/angular-animate/.bower.json
	war/frontEnd/app/bower_components/angular-animate/README.md
	war/frontEnd/app/bower_components/angular-animate/angular-animate.js
	war/frontEnd/app/bower_components/angular-animate/angular-animate.min.js
	war/frontEnd/app/bower_components/angular-animate/angular-animate.min.js.map
	war/frontEnd/app/bower_components/angular-animate/bower.json
	war/frontEnd/app/bower_components/angular-cookies/.bower.json
	war/frontEnd/app/bower_components/angular-cookies/README.md
	war/frontEnd/app/bower_components/angular-cookies/angular-cookies.js
	war/frontEnd/app/bower_components/angular-cookies/angular-cookies.min.js
	war/frontEnd/app/bower_components/angular-cookies/angular-cookies.min.js.map
	war/frontEnd/app/bower_components/angular-cookies/bower.json
	war/frontEnd/app/bower_components/angular-mocks/.bower.json
	war/frontEnd/app/bower_components/angular-mocks/README.md
	war/frontEnd/app/bower_components/angular-mocks/angular-mocks.js
	war/frontEnd/app/bower_components/angular-mocks/bower.json
	war/frontEnd/app/bower_components/angular-resource/.bower.json
	war/frontEnd/app/bower_components/angular-resource/README.md
	war/frontEnd/app/bower_components/angular-resource/angular-resource.js
	war/frontEnd/app/bower_components/angular-resource/angular-resource.min.js
	war/frontEnd/app/bower_components/angular-resource/angular-resource.min.js.map
	war/frontEnd/app/bower_components/angular-resource/bower.json
	war/frontEnd/app/bower_components/angular-route/.bower.json
	war/frontEnd/app/bower_components/angular-route/README.md
	war/frontEnd/app/bower_components/angular-route/angular-route.js
	war/frontEnd/app/bower_components/angular-route/angular-route.min.js
	war/frontEnd/app/bower_components/angular-route/angular-route.min.js.map
	war/frontEnd/app/bower_components/angular-route/bower.json
	war/frontEnd/app/bower_components/angular-sanitize/.bower.json
	war/frontEnd/app/bower_components/angular-sanitize/README.md
	war/frontEnd/app/bower_components/angular-sanitize/angular-sanitize.js
	war/frontEnd/app/bower_components/angular-sanitize/angular-sanitize.min.js
	war/frontEnd/app/bower_components/angular-sanitize/angular-sanitize.min.js.map
	war/frontEnd/app/bower_components/angular-sanitize/bower.json
	war/frontEnd/app/bower_components/angular-scenario/.bower.json
	war/frontEnd/app/bower_components/angular-scenario/README.md
	war/frontEnd/app/bower_components/angular-scenario/angular-scenario.js
	war/frontEnd/app/bower_components/angular-scenario/bower.json
	war/frontEnd/app/bower_components/angular-scenario/jstd-scenario-adapter-config.js
	war/frontEnd/app/bower_components/angular-scenario/jstd-scenario-adapter.js
	war/frontEnd/app/bower_components/angular-touch/.bower.json
	war/frontEnd/app/bower_components/angular-touch/README.md
	war/frontEnd/app/bower_components/angular-touch/angular-touch.js
	war/frontEnd/app/bower_components/angular-touch/angular-touch.min.js
	war/frontEnd/app/bower_components/angular-touch/angular-touch.min.js.map
	war/frontEnd/app/bower_components/angular-touch/bower.json
	war/frontEnd/app/bower_components/angular/.bower.json
	war/frontEnd/app/bower_components/angular/README.md
	war/frontEnd/app/bower_components/angular/angular-csp.css
	war/frontEnd/app/bower_components/angular/angular.js
	war/frontEnd/app/bower_components/angular/angular.min.js
	war/frontEnd/app/bower_components/angular/angular.min.js.gzip
	war/frontEnd/app/bower_components/angular/angular.min.js.map
	war/frontEnd/app/bower_components/angular/bower.json
	war/frontEnd/app/bower_components/bootstrap/.bower.json
	war/frontEnd/app/bower_components/bootstrap/Gruntfile.js
	war/frontEnd/app/bower_components/bootstrap/LICENSE
	war/frontEnd/app/bower_components/bootstrap/README.md
	war/frontEnd/app/bower_components/bootstrap/bower.json
	war/frontEnd/app/bower_components/bootstrap/dist/css/bootstrap-theme.css
	war/frontEnd/app/bower_components/bootstrap/dist/css/bootstrap-theme.css.map
	war/frontEnd/app/bower_components/bootstrap/dist/css/bootstrap-theme.min.css
	war/frontEnd/app/bower_components/bootstrap/dist/css/bootstrap.css
	war/frontEnd/app/bower_components/bootstrap/dist/css/bootstrap.css.map
	war/frontEnd/app/bower_components/bootstrap/dist/css/bootstrap.min.css
	war/frontEnd/app/bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
	war/frontEnd/app/bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
	war/frontEnd/app/bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
	war/frontEnd/app/bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
	war/frontEnd/app/bower_components/bootstrap/dist/js/bootstrap.js
	war/frontEnd/app/bower_components/bootstrap/dist/js/bootstrap.min.js
	war/frontEnd/app/bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot
	war/frontEnd/app/bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg
	war/frontEnd/app/bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf
	war/frontEnd/app/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff
	war/frontEnd/app/bower_components/bootstrap/grunt/bs-glyphicons-data-generator.js
	war/frontEnd/app/bower_components/bootstrap/grunt/bs-lessdoc-parser.js
	war/frontEnd/app/bower_components/bootstrap/grunt/bs-raw-files-generator.js
	war/frontEnd/app/bower_components/bootstrap/grunt/shrinkwrap.js
	war/frontEnd/app/bower_components/bootstrap/js/affix.js
	war/frontEnd/app/bower_components/bootstrap/js/alert.js
	war/frontEnd/app/bower_components/bootstrap/js/button.js
	war/frontEnd/app/bower_components/bootstrap/js/carousel.js
	war/frontEnd/app/bower_components/bootstrap/js/collapse.js
	war/frontEnd/app/bower_components/bootstrap/js/dropdown.js
	war/frontEnd/app/bower_components/bootstrap/js/modal.js
	war/frontEnd/app/bower_components/bootstrap/js/popover.js
	war/frontEnd/app/bower_components/bootstrap/js/scrollspy.js
	war/frontEnd/app/bower_components/bootstrap/js/tab.js
	war/frontEnd/app/bower_components/bootstrap/js/tooltip.js
	war/frontEnd/app/bower_components/bootstrap/js/transition.js
	war/frontEnd/app/bower_components/bootstrap/less/alerts.less
	war/frontEnd/app/bower_components/bootstrap/less/badges.less
	war/frontEnd/app/bower_components/bootstrap/less/bootstrap.less
	war/frontEnd/app/bower_components/bootstrap/less/breadcrumbs.less
	war/frontEnd/app/bower_components/bootstrap/less/button-groups.less
	war/frontEnd/app/bower_components/bootstrap/less/buttons.less
	war/frontEnd/app/bower_components/bootstrap/less/carousel.less
	war/frontEnd/app/bower_components/bootstrap/less/close.less
	war/frontEnd/app/bower_components/bootstrap/less/code.less
	war/frontEnd/app/bower_components/bootstrap/less/component-animations.less
	war/frontEnd/app/bower_components/bootstrap/less/dropdowns.less
	war/frontEnd/app/bower_components/bootstrap/less/forms.less
	war/frontEnd/app/bower_components/bootstrap/less/glyphicons.less
	war/frontEnd/app/bower_components/bootstrap/less/grid.less
	war/frontEnd/app/bower_components/bootstrap/less/input-groups.less
	war/frontEnd/app/bower_components/bootstrap/less/jumbotron.less
	war/frontEnd/app/bower_components/bootstrap/less/labels.less
	war/frontEnd/app/bower_components/bootstrap/less/list-group.less
	war/frontEnd/app/bower_components/bootstrap/less/media.less
	war/frontEnd/app/bower_components/bootstrap/less/mixins.less
	war/frontEnd/app/bower_components/bootstrap/less/modals.less
	war/frontEnd/app/bower_components/bootstrap/less/navbar.less
	war/frontEnd/app/bower_components/bootstrap/less/navs.less
	war/frontEnd/app/bower_components/bootstrap/less/normalize.less
	war/frontEnd/app/bower_components/bootstrap/less/pager.less
	war/frontEnd/app/bower_components/bootstrap/less/pagination.less
	war/frontEnd/app/bower_components/bootstrap/less/panels.less
	war/frontEnd/app/bower_components/bootstrap/less/popovers.less
	war/frontEnd/app/bower_components/bootstrap/less/print.less
	war/frontEnd/app/bower_components/bootstrap/less/progress-bars.less
	war/frontEnd/app/bower_components/bootstrap/less/responsive-utilities.less
	war/frontEnd/app/bower_components/bootstrap/less/scaffolding.less
	war/frontEnd/app/bower_components/bootstrap/less/tables.less
	war/frontEnd/app/bower_components/bootstrap/less/theme.less
	war/frontEnd/app/bower_components/bootstrap/less/thumbnails.less
	war/frontEnd/app/bower_components/bootstrap/less/tooltip.less
	war/frontEnd/app/bower_components/bootstrap/less/type.less
	war/frontEnd/app/bower_components/bootstrap/less/utilities.less
	war/frontEnd/app/bower_components/bootstrap/less/variables.less
	war/frontEnd/app/bower_components/bootstrap/less/wells.less
	war/frontEnd/app/bower_components/bootstrap/package.json
	war/frontEnd/app/bower_components/bootstrap/test-infra/README.md
	war/frontEnd/app/bower_components/bootstrap/test-infra/npm-shrinkwrap.canonical.json
	war/frontEnd/app/bower_components/bootstrap/test-infra/requirements.txt
	war/frontEnd/app/bower_components/bootstrap/test-infra/s3_cache.py
	war/frontEnd/app/bower_components/bootstrap/test-infra/sauce_browsers.yml
	war/frontEnd/app/bower_components/bootstrap/test-infra/uncached-npm-install.sh
	war/frontEnd/app/bower_components/es5-shim/.bower.json
	war/frontEnd/app/bower_components/es5-shim/CHANGES
	war/frontEnd/app/bower_components/es5-shim/CONTRIBUTORS.md
	war/frontEnd/app/bower_components/es5-shim/LICENSE
	war/frontEnd/app/bower_components/es5-shim/README.md
	war/frontEnd/app/bower_components/es5-shim/bower.json
	war/frontEnd/app/bower_components/es5-shim/component.json
	war/frontEnd/app/bower_components/es5-shim/es5-sham.js
	war/frontEnd/app/bower_components/es5-shim/es5-sham.map
	war/frontEnd/app/bower_components/es5-shim/es5-sham.min.js
	war/frontEnd/app/bower_components/es5-shim/es5-shim.js
	war/frontEnd/app/bower_components/es5-shim/es5-shim.map
	war/frontEnd/app/bower_components/es5-shim/es5-shim.min.js
	war/frontEnd/app/bower_components/es5-shim/package.json
	war/frontEnd/app/bower_components/es5-shim/shims.json
	war/frontEnd/app/bower_components/jquery/.bower.json
	war/frontEnd/app/bower_components/jquery/MIT-LICENSE.txt
	war/frontEnd/app/bower_components/jquery/bower.json
	war/frontEnd/app/bower_components/jquery/dist/jquery.js
	war/frontEnd/app/bower_components/jquery/dist/jquery.min.js
	war/frontEnd/app/bower_components/jquery/dist/jquery.min.map
	war/frontEnd/app/bower_components/jquery/src/ajax.js
	war/frontEnd/app/bower_components/jquery/src/ajax/jsonp.js
	war/frontEnd/app/bower_components/jquery/src/ajax/load.js
	war/frontEnd/app/bower_components/jquery/src/ajax/parseJSON.js
	war/frontEnd/app/bower_components/jquery/src/ajax/parseXML.js
	war/frontEnd/app/bower_components/jquery/src/ajax/script.js
	war/frontEnd/app/bower_components/jquery/src/ajax/var/nonce.js
	war/frontEnd/app/bower_components/jquery/src/ajax/var/rquery.js
	war/frontEnd/app/bower_components/jquery/src/ajax/xhr.js
	war/frontEnd/app/bower_components/jquery/src/attributes.js
	war/frontEnd/app/bower_components/jquery/src/attributes/attr.js
	war/frontEnd/app/bower_components/jquery/src/attributes/classes.js
	war/frontEnd/app/bower_components/jquery/src/attributes/prop.js
	war/frontEnd/app/bower_components/jquery/src/attributes/support.js
	war/frontEnd/app/bower_components/jquery/src/attributes/val.js
	war/frontEnd/app/bower_components/jquery/src/callbacks.js
	war/frontEnd/app/bower_components/jquery/src/core.js
	war/frontEnd/app/bower_components/jquery/src/core/access.js
	war/frontEnd/app/bower_components/jquery/src/core/init.js
	war/frontEnd/app/bower_components/jquery/src/core/parseHTML.js
	war/frontEnd/app/bower_components/jquery/src/core/ready.js
	war/frontEnd/app/bower_components/jquery/src/core/var/rsingleTag.js
	war/frontEnd/app/bower_components/jquery/src/css.js
	war/frontEnd/app/bower_components/jquery/src/css/addGetHookIf.js
	war/frontEnd/app/bower_components/jquery/src/css/curCSS.js
	war/frontEnd/app/bower_components/jquery/src/css/defaultDisplay.js
	war/frontEnd/app/bower_components/jquery/src/css/hiddenVisibleSelectors.js
	war/frontEnd/app/bower_components/jquery/src/css/support.js
	war/frontEnd/app/bower_components/jquery/src/css/swap.js
	war/frontEnd/app/bower_components/jquery/src/css/var/cssExpand.js
	war/frontEnd/app/bower_components/jquery/src/css/var/getStyles.js
	war/frontEnd/app/bower_components/jquery/src/css/var/isHidden.js
	war/frontEnd/app/bower_components/jquery/src/css/var/rmargin.js
	war/frontEnd/app/bower_components/jquery/src/css/var/rnumnonpx.js
	war/frontEnd/app/bower_components/jquery/src/data.js
	war/frontEnd/app/bower_components/jquery/src/data/Data.js
	war/frontEnd/app/bower_components/jquery/src/data/accepts.js
	war/frontEnd/app/bower_components/jquery/src/data/var/data_priv.js
	war/frontEnd/app/bower_components/jquery/src/data/var/data_user.js
	war/frontEnd/app/bower_components/jquery/src/deferred.js
	war/frontEnd/app/bower_components/jquery/src/deprecated.js
	war/frontEnd/app/bower_components/jquery/src/dimensions.js
	war/frontEnd/app/bower_components/jquery/src/effects.js
	war/frontEnd/app/bower_components/jquery/src/effects/Tween.js
	war/frontEnd/app/bower_components/jquery/src/effects/animatedSelector.js
	war/frontEnd/app/bower_components/jquery/src/event.js
	war/frontEnd/app/bower_components/jquery/src/event/alias.js
	war/frontEnd/app/bower_components/jquery/src/event/support.js
	war/frontEnd/app/bower_components/jquery/src/exports/amd.js
	war/frontEnd/app/bower_components/jquery/src/exports/global.js
	war/frontEnd/app/bower_components/jquery/src/intro.js
	war/frontEnd/app/bower_components/jquery/src/jquery.js
	war/frontEnd/app/bower_components/jquery/src/manipulation.js
	war/frontEnd/app/bower_components/jquery/src/manipulation/_evalUrl.js
	war/frontEnd/app/bower_components/jquery/src/manipulation/support.js
	war/frontEnd/app/bower_components/jquery/src/manipulation/var/rcheckableType.js
	war/frontEnd/app/bower_components/jquery/src/offset.js
	war/frontEnd/app/bower_components/jquery/src/outro.js
	war/frontEnd/app/bower_components/jquery/src/queue.js
	war/frontEnd/app/bower_components/jquery/src/queue/delay.js
	war/frontEnd/app/bower_components/jquery/src/selector-native.js
	war/frontEnd/app/bower_components/jquery/src/selector-sizzle.js
	war/frontEnd/app/bower_components/jquery/src/selector.js
	war/frontEnd/app/bower_components/jquery/src/serialize.js
	war/frontEnd/app/bower_components/jquery/src/sizzle/dist/sizzle.js
	war/frontEnd/app/bower_components/jquery/src/sizzle/dist/sizzle.min.js
	war/frontEnd/app/bower_components/jquery/src/sizzle/dist/sizzle.min.map
	war/frontEnd/app/bower_components/jquery/src/traversing.js
	war/frontEnd/app/bower_components/jquery/src/traversing/findFilter.js
	war/frontEnd/app/bower_components/jquery/src/traversing/var/rneedsContext.js
	war/frontEnd/app/bower_components/jquery/src/var/arr.js
	war/frontEnd/app/bower_components/jquery/src/var/class2type.js
	war/frontEnd/app/bower_components/jquery/src/var/concat.js
	war/frontEnd/app/bower_components/jquery/src/var/hasOwn.js
	war/frontEnd/app/bower_components/jquery/src/var/indexOf.js
	war/frontEnd/app/bower_components/jquery/src/var/pnum.js
	war/frontEnd/app/bower_components/jquery/src/var/push.js
	war/frontEnd/app/bower_components/jquery/src/var/rnotwhite.js
	war/frontEnd/app/bower_components/jquery/src/var/slice.js
	war/frontEnd/app/bower_components/jquery/src/var/strundefined.js
	war/frontEnd/app/bower_components/jquery/src/var/support.js
	war/frontEnd/app/bower_components/jquery/src/var/toString.js
	war/frontEnd/app/bower_components/jquery/src/wrap.js
	war/frontEnd/app/bower_components/json3/.bower.json
	war/frontEnd/app/bower_components/json3/LICENSE
	war/frontEnd/app/bower_components/json3/README.md
	war/frontEnd/app/bower_components/json3/bower.json
	war/frontEnd/app/bower_components/json3/lib/json3.js
	war/frontEnd/app/bower_components/json3/lib/json3.min.js
	war/frontEnd/app/favicon.ico
	war/frontEnd/app/images/yeoman.png
	war/frontEnd/app/index.html
	war/frontEnd/app/robots.txt
	war/frontEnd/app/scripts/app.js
	war/frontEnd/app/scripts/controllers/about.js
	war/frontEnd/app/scripts/controllers/listqn.js
	war/frontEnd/app/scripts/controllers/listqs.js
	war/frontEnd/app/scripts/controllers/listuser.js
	war/frontEnd/app/scripts/controllers/main.js
	war/frontEnd/app/styles/main.css
	war/frontEnd/app/views/about.html
	war/frontEnd/app/views/listqn.html
	war/frontEnd/app/views/listqs.html
	war/frontEnd/app/views/main.html