ER master mm.

GetNote lavet,
Merge branch 'master' of https://github.com/Kyedes/ServerTEO2014.git

Conflicts:
	ServerTEO/src/quote/Quotes.java