merge
Merge branch 'master' of https://github.com/sjoffraud/yasl

Conflicts:
	mobile/package.json
	mobile/src/lib/angular-animate/angular-animate.js
	mobile/src/lib/angular-animate/angular-animate.min.js
	mobile/src/lib/angular-sanitize/angular-sanitize.js
	mobile/src/lib/angular-sanitize/angular-sanitize.min.js
	mobile/src/lib/angular-ui-router/release/angular-ui-router.js
	mobile/src/lib/angular-ui-router/release/angular-ui-router.min.js
	mobile/src/lib/angular/angular.js
	mobile/src/lib/angular/angular.min.js
	mobile/src/lib/ionic/fonts/ionicons.svg
	mobile/src/lib/ionic/fonts/ionicons.ttf
	mobile/src/lib/ionic/fonts/ionicons.woff
	mobile/src/lib/ionic/js/ionic-angular.js
	mobile/src/lib/ionic/js/ionic.js
	mobile/src/modules/app/index.js
	mobile/src/modules/app/login/index.js
	mobile/src/modules/app/pages/about.html
	mobile/src/modules/app/pages/home.html
	mobile/src/modules/app/pages/index.js
	mobile/src/modules/index.js
	mobile/src/style/main.scss
merge