Allow preview on public forms - fixes #1099
Merge branch 'master' into submission-time_validations
Merge branch 'master' into preview_shared_forms

Conflicts:
	main/tests/test_form_show.py
Merge pull request #1232 from modilabs/preview_shared_forms

Allow preview on public forms - fixes #1099
check converted dates for xls validity before conversion
fixed test taht required valid date conversion
Merge branch '1254_year_not_supported_by_excel'
updated jquery cdn source and version to 1.10
map refactoring
added jasmine tests via karma
form model to load form.json
changed if / return if style to if / else if
Revert "changed if / return if style to if / else if"

This reverts commit 055419d0f5722696a6004e69b4e33ede6421e6e6.
Revert "form model to load form.json"

This reverts commit 54facb9a1ab327dd35ea018115cdb0580dc7bb9b.
Revert "map refactoring"

This reverts commit 41ff4a80d43103a0d1e322918b8f303e03122c3b.
include JQuery.migrate for backward compatibility - iphone style checkbixes had broken on $.browser detection
reduce one more css file, placing the css in a class specific css block
initial refactoring of templates, only include necessary js and/or css when in use in a page
optimized images
tie down django to <1.6 until codebase is updated for django 1.6