Merge branch 'master' of github.com:TimMikeladze/js-tower-defense

Conflicts:
	javascripts/app/menus/sidebar.js
waves
waves