Merge remote-tracking branch 'upstream/master'
DEBUG Add esprima javascript parser
DEBUG changing directory of esprima from node_modules to
ReloadServer/node_modules. Added domtosource node module
DEBUG Initial Commit of javascript syntax check
- Initial implementation of parse checking when reloading (don't stop reload
  procedure if there are syntax errors
- Modification of esprima module to accept startLineNumber option for error
 calculation of line number of the error in the javascript inside <script>
 tags without src attribute (not external files)
RELOAD-315 Initial Commit of aardwolf's code rewriter implementation
	- new folder:   ReloadServer/application/rewriter/
	- new wormhole.js files in project templates
	- changes in reload_manager.js to support aardwolf code rewriting
	- IMPORTANT FIXES:
		o removeRecursive function at reload manager was modified to
		support options parameter (currently does not delete the
		folders).
		o Hardcoded configuration values at ReloadServer/application/rewriter/config/config.local.js.
Merge remote-tracking branch 'upstream/OneOne' into DEBUG

Conflicts:
	ReloadServer/application/reload_manager.js
- Added aarwolf server inside reload server
- Fixed a bug in removeRecursive function in ReloadServer/application/
  reload_manager.js
- Changed hardcoded paths and configs for aardwolf functionality
- Added a tab in reload UI for aardwolf
Added copying of aardwolf server in the build script
Added aardwolf node modules.
Changed the aardwolf server ui to port 8501
Fixed the offline code rewritter port from 8000 to 8501
Fix for copying aardwolf files for MAC.
	modified:   ReloadLauncher/Mac/Reload.platypus
RELOAD-359
	- Added Javascript syntax error reporting to aardwolf UI instead
	  on console.
	- Code Cleanup and removing commented code
	- Added weinre injection after disabling it because of development
RELOAD-359
	- Removed the directory ReloadServer/aardwolf/samples from repo -
	  tracking. It is used for temporary file storage during debugging
Merge remote-tracking branch 'upstream/master' into DEBUG
Merge branch 'DEBUG'
RELOAD-315, RELOAD-359
	- Removed unneeded comments from the UI
	  modified:   ReloadServer/UI/js/views/aardwolf/main.js
	- Removed unneeded comments from the aardwolf rewritter
	  modified:   ReloadServer/application/rewriter/rewriter-server.js
Merge pull request #122 from bravewick/master

RELOAD-315, RELOAD-359