Trying to get swipejs to play with neatjs
Merge branch 'master' into AppLogicContinue

* master:
  Trying to get swipejs to play with neatjs

Conflicts:
	build/js/ash.js