Tests, Grunt, R.js
merging
deleting and readding site.js
merging