correção de bugs
Merge branch 'master' of https://github.com/uiliw/iea

# By Willy Werlang
# Via Willy Werlang
* 'master' of https://github.com/uiliw/iea:
  no message

Conflicts:
	js/main.js