First commit
Merge branch 'master' of github.com:reduardo7/php-swa-framework

Conflicts:
	app/class/model.class.php
	app/models/ModelUsuarios.inc.php