Merge remote-tracking branch 'origin/master'

Conflicts:
	EduTestes/App.config

VS 2012
Merge branch 'master' of https://github.com/itarocha/EDU