Updated files
Merge branch 'master' of https://github.com/hesylvia/melagrid

Conflicts:
	redrugs/redrugs/public/css/style.css
	redrugs/redrugs/public/javascript/redrugs.js
	redrugs/redrugs/templates/redrugs.html
updated files