Dependencies update
Merge branch 'master' of github.com:paazmaya/renshuu.paazmaya.com

Conflicts:
	package.json