loggedin
Merge branch 'master' of https://github.com/rvrita/agroinform

Conflicts:
	css/480.css
	css/620.css