Reset!
Merge branch 'master' of https://github.com/rspach/Event-Faces

Conflicts:
	www/config.xml
	www/css/SeeYou.css
	www/css/SeeYou.min.css
	www/css/font/fontawesome-webfont.svg
	www/css/index.css
	www/css/jqm-icon-pack-fa.css
	www/css/jqm-icon-pack-fa.scss
	www/css/jquery.mobile-1.3.2.css
	www/css/jquery.mobile-1.3.2.min.css
	www/css/jquery.mobile.structure-1.3.2.css
	www/css/jquery.mobile.structure-1.3.2.min.css
	www/css/jquery.mobile.theme-1.3.2.css
	www/css/jquery.mobile.theme-1.3.2.min.css
	www/css/styles.css
	www/event.html
	www/gallery.html
	www/index.html
	www/js/facedetection/COPYING
	www/js/facedetection/ccv.js
	www/js/facedetection/face.js
	www/js/index.js
	www/js/jquery.facedetection.js
	www/js/jquery.js
	www/js/jquery.mobile-1.3.2.js
	www/js/jquery.mobile-1.3.2.min.js
	www/res/screen/tizen/README.md
	www/spec.html
	www/spec/helper.js
	www/spec/index.js
	www/spec/lib/jasmine-1.2.0/MIT.LICENSE
	www/spec/lib/jasmine-1.2.0/jasmine-html.js
	www/spec/lib/jasmine-1.2.0/jasmine.css
	www/spec/lib/jasmine-1.2.0/jasmine.js