Fixed design broken in last commit, properly implemented custom urls, optimized and cleaned
Merge branch 'master' of github.com:nixolas1/Squeeze