Merge branch 'develop'
Revert "Moving static content to the right place"

This reverts commit fa8644d5c9d6aa72927f71881838c957b94e5707.
Merge branch 'develop'
Check if a value is instance of basestring, otherwise it doesn't work with
unicode types.
Allow blank value for LocationField.
Merge branch 'fix_unicode_issue' into develop

Conflicts:
	location_field/widgets.py