teste
testet on 8-8-2014
Merge origin/master

Conflicts:
	LICENSE