merge
Merge branch 'master' of https://github.com/lukkm/TPE_PROTOS_2013
adminHandler
merge con master, agregado maven
merge con master, agregado maven
Merge branch 'master' into adminHandler
Sotuyooooooooooooo
Sotuyo merged
Finished JSON Parser
Added ConfigurationCommand
Finished test
Recognizing stanza types: Message, JIDConfiguration, Presence
Fixed NullPointerException
Merge branch 'adminHandler' of https://github.com/lukkm/TPE_PROTOS_2013 into adminHandler
Changes
AdminHandler