Added myself to the diplomate list, fixed typos and made corrections to Dutch locale
Merge pull request #685 from JasperDhaene/master

Added myself to the diplomate list, fixed typos and made corrections to Dutch locale
Translate some word from English -> Chinese.  (zh-HANS.coffee)
Merge pull request #688 from 1c7/master

Translate some word from English -> Chinese.  (zh-HANS.coffee)
Migrate from .on, .once to .listenTo, .listenToOnce
Added myself to the signature.
Updates fb and g+ functions to be called on api load, fixes #695
Added infinite loop handling to Simulator.
Merge branch 'master' of https://github.com/codecombat/codecombat
Merge pull request #687 from kgy01/master

Hide arrow's shadow if buried
Merge branch 'master' of https://github.com/codecombat/codecombat
Removed some unnecessary callbacks.
Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master
"Merge branch 'master' of https://github.com/codecombat/codecombat
Simulator handles more errors.
Fix for infinite loop fix.
Got the gplus friends loading now.
Added a google plus connect button.
Sorted the friend sessions a bit.
Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master

Conflicts:
	app/models/SuperModel.coffee