BUG
BUG
Merge remote-tracking branch 'origin/master'

Conflicts:
	example/tutorial_simple_mvc/index.html
BUG