Merges current pro-grid/master with ridhoq/master (!!!)

This merges your folder restructuring with the jshint stuff I did. Tested and all is well.