version 3
11/04/2013
Merge branch 'master' of https://github.com/jsiles/manufactura.git

Conflicts:
	compramateriales3.php
	js/loadMenu.js

Signed-off-by: Jorge Siles <jorge.siles@gmail.com>