Added no conflictr for $ and all js is now in main.js

Signed-off-by: Nicolay Hekkens <nicolay@wednesdayagency.com>