toma ai
Merge branch 'master' of https://github.com/gabrielmcf/euviaqui

Conflicts:
	application/cache/kohana_configuration
	application/cache/kohana_find_file_paths
	application/cache/kohana_language
toma