Partial commit.
(partial) Fixed most buy and bc incompatibilities
Code cosmetics
Merge branch 'master' into stpl3
Turned StplParser.syntax into a property.
Fixed some comments.
SimpleTemplate now accepts non-utf8 source to maintain bc.
Lots of tests for the new multiblock template syntax and some fixes and improvements in the template parser code.
Merge branch 'master' into stpl3
Fixed wrong named class
Fixed some pep8 warnings
Removed unused imports
Fixed syntax error.
Merge pull request #490 from wladston/master

Fixing a syntax error.
Merge pull request #488 from myzhan/master

Keep zh_CN doc update-to-date
Merge pull request #489 from fatiherikli/master

Some fixes on tests
Attempt to load simplejson first since it is so much faster.
Merge pull request #495 from b4hand/master

Prefer to use simplejson if it is available
Updated url variable syntax.
typo
Merge branch 'master' into stpl3

Conflicts:
	bottle.py