small changes in rails
fix single card problem
add css
Merge remote-tracking branch 'origin/rebuild'

Conflicts:
	.gitignore
	app/assets/stylesheets/application.css.scss
	public/bower_components/angular-ui-router/.bower.json
	public/bower_components/angular-ui-router/README.md
	public/bower_components/angular-ui-router/bower.json
	public/bower_components/angular-ui-router/component.json
	public/bower_components/angular-ui-router/package.json
	public/bower_components/angular-ui-router/release/angular-ui-router.js
	public/bower_components/angular-ui-router/release/angular-ui-router.min.js
	public/bower_components/angular-ui-router/src/viewDirective.js
	public/bower_components/angular-ui-utils/package.json
	public/bower_components/angular-ui/package.json
	public/bower_components/ionic/.bower.json
	public/bower_components/lodash/.bower.json
	public/bower_components/lodash/bower.json
	public/bower_components/lodash/dist/lodash.compat.js
	public/bower_components/lodash/dist/lodash.compat.min.js
	public/bower_components/lodash/dist/lodash.js
	public/bower_components/lodash/dist/lodash.min.js
	public/bower_components/lodash/dist/lodash.underscore.js
	public/bower_components/lodash/dist/lodash.underscore.min.js
	public/bower_components/restangular/.bower.json
	public/bower_components/restangular/CHANGELOG.md
	public/bower_components/restangular/README.md
	public/bower_components/restangular/bower.json
	public/bower_components/restangular/dist/restangular.js
	public/bower_components/restangular/dist/restangular.min.js
	public/bower_components/restangular/dist/restangular.zip
	public/bower_components/restangular/package.json
	public/bower_components/restangular/src/restangular.js
	public/bower_components/restangular/test/restangularSpec.js
	public/index.html