Merge remote-tracking branch 'origin/Yii'

Conflicts:
	.gitignore
	docs/demosurveys/ls2_EM_question_attributes.lss
	docs/demosurveys/ls2_cascading_array_filter.lss
	docs/demosurveys/ls2_test_em_sq_validation.lss
	docs/demosurveys/ls2_validation_tests.lss
	docs/license.txt
	docs/release_notes.txt
	images/delete.png
	images/placeholder.png
	index.php
	locale/_template/limesurvey.pot
	locale/af/LC_MESSAGES/af.mo
	locale/am/LC_MESSAGES/am.mo
	locale/ar/LC_MESSAGES/ar.mo
	locale/be/LC_MESSAGES/be.mo
	locale/bg/LC_MESSAGES/bg.mo
	locale/bs/LC_MESSAGES/bs.mo
	locale/ca/LC_MESSAGES/ca.mo
	locale/cs/LC_MESSAGES/cs.mo
	locale/cy/LC_MESSAGES/cy.mo
	locale/da/LC_MESSAGES/da.mo
	locale/de-informal/LC_MESSAGES/de-informal.mo
	locale/de/LC_MESSAGES/de.mo
	locale/el/LC_MESSAGES/el.mo
	locale/en/LC_MESSAGES/en.mo
	locale/es-CL/LC_MESSAGES/es-CL.mo
	locale/es-MX/LC_MESSAGES/es-MX.mo
	locale/es/LC_MESSAGES/es.mo
	locale/et/LC_MESSAGES/et.mo
	locale/eu/LC_MESSAGES/eu.mo
	locale/fa/LC_MESSAGES/fa.mo
	locale/fi/LC_MESSAGES/fi.mo
	locale/fr/LC_MESSAGES/fr.mo
	locale/ga/LC_MESSAGES/ga.mo
	locale/gl/LC_MESSAGES/gl.mo
	locale/he/LC_MESSAGES/he.mo
	locale/hi/LC_MESSAGES/hi.mo
	locale/hr/LC_MESSAGES/hr.mo
	locale/hu/LC_MESSAGES/hu.mo
	locale/id/LC_MESSAGES/id.mo
	locale/is/LC_MESSAGES/is.mo
	locale/it/LC_MESSAGES/it.mo
	locale/ja/LC_MESSAGES/ja.mo
	locale/ko/LC_MESSAGES/ko.mo
	locale/lt/LC_MESSAGES/lt.mo
	locale/lv/LC_MESSAGES/lv.mo
	locale/mk/LC_MESSAGES/mk.mo
	locale/ms/LC_MESSAGES/ms.mo
	locale/mt/LC_MESSAGES/mt.mo
	locale/nb/LC_MESSAGES/nb.mo
	locale/nl-informal/LC_MESSAGES/nl-informal.mo
	locale/nl/LC_MESSAGES/nl.mo
	locale/nn/LC_MESSAGES/nn.mo
	locale/pa/LC_MESSAGES/pa.mo
	locale/pl/LC_MESSAGES/pl.mo
	locale/pt-BR/LC_MESSAGES/pt-BR.mo
	locale/pt/LC_MESSAGES/pt.mo
	locale/ro/LC_MESSAGES/ro.mo
	locale/ru/LC_MESSAGES/ru.mo
	locale/si/LC_MESSAGES/si.mo
	locale/sk/LC_MESSAGES/sk.mo
	locale/sl/LC_MESSAGES/sl.mo
	locale/sq/LC_MESSAGES/sq.mo
	locale/sr/LC_MESSAGES/sr.mo
	locale/sv/LC_MESSAGES/sv.mo
	locale/th/LC_MESSAGES/th.mo
	locale/tr/LC_MESSAGES/tr.mo
	locale/ur/LC_MESSAGES/ur.mo
	locale/vi/LC_MESSAGES/vi.mo
	locale/zh-Hans/LC_MESSAGES/zh-Hans.mo
	locale/zh-Hant-HK/LC_MESSAGES/zh-Hant-HK.mo
	locale/zh-Hant-TW/LC_MESSAGES/zh-Hant-TW.mo
	scripts/ajaxupload.js
	scripts/jquery/jquery.js
	scripts/jquery/jquery.multiselect.min.js
	scripts/jquery/jquery.qtip.js
	scripts/jquery/jquery.tablesorter.min.js
	scripts/jquery/lime-slider.js
	scripts/jquery/locale/jquery.ui.datepicker-en.js
	scripts/modaldialog.js
	scripts/survey_runtime.js
	scripts/uploader.js
	templates/basic/ie_fix_6.css
	templates/basic/ie_fix_7.css
	templates/basic/ie_fix_8.css
	templates/basic/question.pstpl
	templates/basic/startpage.pstpl
	templates/basic/template-rtl.css
	templates/basic/template.css
	templates/bluengrey/ie_fix_7.css
	templates/bluengrey/ie_fix_8.css
	templates/bluengrey/navigator.pstpl
	templates/bluengrey/startpage.pstpl
	templates/bluengrey/template-rtl.css
	templates/bluengrey/template.css
	templates/citronade/startpage.pstpl
	templates/citronade/survey.pstpl
	templates/citronade/surveylist.pstpl
	templates/citronade/template-rtl.css
	templates/citronade/template.css
	templates/citronade/template.js
	templates/citronade/welcome.pstpl
	templates/clear_logo/ie_fix_7.css
	templates/clear_logo/startpage.pstpl
	templates/clear_logo/template-rtl.css
	templates/clear_logo/template.css
	templates/default/assessment.pstpl
	templates/default/clearall.pstpl
	templates/default/completed.pstpl
	templates/default/groupdescription.pstpl
	templates/default/ie_fix_6.css
	templates/default/ie_fix_7.css
	templates/default/ie_fix_8.css
	templates/default/load.pstpl
	templates/default/navigator.pstpl
	templates/default/print_group.pstpl
	templates/default/print_question.pstpl
	templates/default/print_survey.pstpl
	templates/default/privacy.pstpl
	templates/default/question.pstpl
	templates/default/register.pstpl
	templates/default/save.pstpl
	templates/default/startpage.pstpl
	templates/default/survey.pstpl
	templates/default/surveylist.pstpl
	templates/default/template-rtl.css
	templates/default/template.css
	templates/default/welcome.pstpl
	templates/eirenicon/ie_fix_7.css
	templates/eirenicon/startpage.pstpl
	templates/eirenicon/template-rtl.css
	templates/eirenicon/template.css
	templates/limespired/ie_fix_7.css
	templates/limespired/startpage.pstpl
	templates/limespired/template-rtl.css
	templates/limespired/template.css
	templates/mint_idea/ie_fix_7.css
	templates/mint_idea/startpage.pstpl
	templates/mint_idea/template-rtl.css
	templates/mint_idea/template.css
	templates/sherpa/ie_fix_7.css
	templates/sherpa/startpage.pstpl
	templates/sherpa/template-rtl.css
	templates/sherpa/template.css
	templates/vallendar/ie_fix_7.css
	templates/vallendar/startpage.pstpl
	templates/vallendar/template-rtl.css
	templates/vallendar/template.css
	tmp/.gitignore
	tmp/readme.txt

.gitignore

@@ -1,2 +1,6 @@
-
+.project
 /upload/surveys/*
+/styles/gringegreen/images/Thumbs.db
+/upload/templates/*
+/tmp/runtime/HTML
+/application/controllers/admin/updater.php

.htaccess

@@ -0,0 +1,10 @@
+<IfModule mod_rewrite.c>
+    RewriteEngine on
+
+    # if a directory or a file exists, use it directly
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteCond %{REQUEST_FILENAME} !-d
+
+    # otherwise forward it to index.php
+    RewriteRule . index.php
+</IfModule>

README

@@ -0,0 +1 @@
+Please check out the /docs directory for further information.