Added default task
added default task
Merge branch 'master' of https://github.com/martinchristov/kidamomtv

Conflicts:
	app/js/app.min.js