Safari 5 (and IOS5) @import file fix
Credits update
Bumped version number
Merge branch 'master' into develop

Conflicts:
	code/templateDetails.xml
Bumped develop version number