Add config.json for copy
Remove watch module from grunt
Merge remote-tracking branch 'origin/master' into dev_implementation
Add src in path for dev javascript
Remove grunt hash module
Merge remote-tracking branch 'upstream/master' into dev_implementation
Remove hash from aliases file
Add cachebuster grunt module to generate hash based on file contents
Add json_merge grunt module to merge our config & hashed.json
Remove basedir from cachebuster
Add basedir back for cachebuster
Merge remote-tracking branch 'origin/master' into dev_implementation

Conflicts:
	Gruntfile.js
Fix path for uncss
Remove extra ' from template
Rename file hash using formatter of cachebuster

Not an optimal solution, will see how to optimize it later
Add data files for binary like markets, idd_codes, localize text
Merge pull request #53 from borisyankov/development

Several features added + merge with 'master'
Add data js in cachebuster, concat, fileindex uglify

As we have added data js files, so we need to compress it to
single file
Merge remote-tracking branch 'upstream/development' into implementation

Conflicts:
	build/copy.js
Add back the windo.page_params for global variable