Code review:

	- POM's review
	- JUnit updated from 3.8.1 to 4.11
	- Log4j updated from 1.2.12 to version 1.2.17
	- Pluging maven-checkstyle-plugin updated from 2.8 to 2.10
	- Pluging maven-assembly-plugin updated from 2.2-beta-3 to 2.4
	- Pluging jcl-core updated from updated from 2.2.2 to 2.4
	- Pluging xmlbeans updated from 2.5 to 2.6
	- Cleanup on file .gitignore 
	- Unuse modules removed
	- Module AMI(experimental) removed
Merge branch 'dev'

Conflicts:
	.gitignore
	api/astive-agi/pom.xml
	api/astive-agi/src/main/java/com/phonytive/astive/agi/AgiException.java
	api/astive-agi/src/main/java/com/phonytive/astive/agi/AgiResponse.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/ChannelStatus.java
	api/astive-agi/src/main/java/com/phonytive/astive/agi/ChannelType.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/CommandProcessor.j
ava
	api/astive-agi/src/main/java/com/phonytive/astive/agi/Connection.java
	api/astive-agi/src/main/java/com/phonytive/astive/agi/Converter.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/DefaultAgiServerSe
ttings.java
	api/astive-agi/src/main/java/com/phonytive/astive/agi/HangupCause.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/PresentationType.j
ava

api/astive-agi/src/main/java/com/phonytive/astive/agi/StringConverter.ja
va
	api/astive-agi/src/main/java/com/phonytive/astive/agi/TonType.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/annotation/AgiComm
and.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/annotation/Boolean
Choose.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/annotation/ParamCo
nverter.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/annotation/Paramet
er.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/annotation/Request
Field.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/annotation/Separat
or.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/Answer.jav
a

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/AsyncAgiBr
eak.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/ControlStr
eamFile.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/DatabaseDe
l.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/DatabaseDe
lTree.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/DatabaseGe
t.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/DatabasePu
t.java
	api/astive-agi/src/main/java/com/phonytive/astive/agi/command/Exec.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/GetChannel
Status.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/GetData.ja
va

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/GetFullVar
iable.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/GetOption.
java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/GetVariabl
e.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/GoSub.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/Hangup.jav
a
	api/astive-agi/src/main/java/com/phonytive/astive/agi/command/Noop.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/ReceiveCha
r.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/ReceiveTex
t.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/RecordFile
.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SayAlpha.j
ava

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SayDate.ja
va

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SayDatetim
e.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SayDigits.
java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SayNumber.
java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SayPhoneti
c.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SayTime.ja
va

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SendImage.
java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SendText.j
ava

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SetAutoHan
gup.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SetCallerI
d.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SetContext
.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SetExtensi
on.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SetMusic.j
ava

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SetPriorit
y.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SetVariabl
e.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SpeechActi
vateGrammar.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SpeechCrea
te.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SpeechDeac
tivateGrammar.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SpeechDest
roy.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SpeechLoad
Grammar.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SpeechReco
gnize.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SpeechSet.
java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/SpeechUnlo
adGrammar.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/StreamFile
.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/TddMode.ja
va

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/Verbose.ja
va

api/astive-agi/src/main/java/com/phonytive/astive/agi/command/WaitForDig
it.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/fastagi/FastAgiCon
nection.java

api/astive-agi/src/main/java/com/phonytive/astive/agi/fastagi/FastAgiRes
ponse.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/AgiRequestTest.jav
a

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/AnswerTest
.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/AsyncAgiBr
eakTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/ChannelSta
tusTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/ControlStr
eamFileTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/DatabaseDe
lTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/DatabaseDe
lTreeTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/DatabaseGe
tTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/DatabasePu
tTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/ExecTest.j
ava

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/GetDataTes
t.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/GetFullVar
iableTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/GetOptionT
est.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/GetVariabl
eTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/GoSubTest.
java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/HangupTest
.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/NoopTest.j
ava

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/ReceiveCha
rTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/ReceiveTex
tTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/RecordFile
Test.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SayAlphaTe
st.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SayDateTes
t.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SayDatetim
eTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SayDigitsT
est.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SayNumberT
est.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SayPhoneti
cTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SayTimeTes
t.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SendImageT
est.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SendTextTe
st.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SetAutoHan
gupTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SetCallerI
dTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SetContext
Test.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SetExtensi
onTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SetMusicTe
st.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SetPriorit
yTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SetVariabl
eTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SpeechActi
vateGrammarTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SpeechCrea
teTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SpeechDeac
tivateGrammarTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SpeechDest
royTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SpeechLoad
GrammarTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SpeechReco
gnizeTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SpeechSetT
est.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/SpeechUnlo
adGrammarTest.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/StreamFile
Test.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/TddModeTes
t.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/VerboseTes
t.java

api/astive-agi/src/test/java/com/phonytive/astive/agi/command/WaitForDig
itTest.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/Authenticator.ja
va
	api/astive-menu/src/main/java/com/phonytive/astive/menu/Digit.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/DuplicatedDigits
Exception.java
	api/astive-menu/src/main/java/com/phonytive/astive/menu/Menu.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/MenuException.ja
va
	api/astive-menu/src/main/java/com/phonytive/astive/menu/MenuItem.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/action/Action.ja
va

api/astive-menu/src/main/java/com/phonytive/astive/menu/action/ActionMap
.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/action/GoExt.jav
a

api/astive-menu/src/main/java/com/phonytive/astive/menu/action/GoTo.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/action/Hangup.ja
va

api/astive-menu/src/main/java/com/phonytive/astive/menu/annontation/Acti
on.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/event/ActionEven
t.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/event/ActionList
ener.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/event/Authentica
tionEvent.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/event/Authentica
tionListener.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/event/DigitsEven
t.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/event/DigitsList
ener.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/event/Event.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/event/FailEvent.
java

api/astive-menu/src/main/java/com/phonytive/astive/menu/event/FailListen
er.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/event/InterDigit
sTimeoutEvent.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/event/InterDigit
sTimeoutListener.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/event/KeyEvent.j
ava

api/astive-menu/src/main/java/com/phonytive/astive/menu/event/KeyListene
r.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/event/MaxFailure
Event.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/event/MaxFailure
Listener.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/event/MaxTimeout
Event.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/event/MaxTimeout
Listener.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/event/PositionCh
angeEvent.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/event/PositionCh
angeListener.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/event/TimeoutEve
nt.java

api/astive-menu/src/main/java/com/phonytive/astive/menu/event/TimeoutLis
tener.java
	apis/atk-api-agi/pom.xml

apis/atk-api-agi/src/main/java/org/astivetoolkit/agi/AgiCommandHandler.j
ava

apis/atk-api-agi/src/main/java/org/astivetoolkit/agi/AgiCommandReply.jav
a
	apis/atk-api-agi/src/main/java/org/astivetoolkit/agi/AgiRequest.java
	apis/atk-api-menu/pom.xml

apis/atk-api-menu/src/main/java/org/astivetoolkit/menu/MenuNavigator.jav
a
	apis/pom.xml
	astive-archetype/pom.xml
	astive-commons/src/main/java/com/phonytive/astive/util/AppLocale.java
	astive-commons/src/main/java/com/phonytive/astive/util/NetUtil.java
	atk-commons/pom.xml
	examples/agitdd/src/main/java/com/phonytive/astive/agitdd/App.java

examples/handling-events/src/main/java/org/astivetoolkit/examples/handli
ngevents/App.java

examples/handlingevents/src/main/java/com/phonytive/astive/examples/hand
lingevents/Main.java

examples/helloworld/src/main/java/com/phonytive/astive/examples/hellowor
ld/App.java
	pom.xml

server/astive-client/src/main/java/com/phonytive/astive/astivlet/Astivle
t.java

server/astive-client/src/main/java/com/phonytive/astive/astivlet/Astivle
tRequest.java
	server/astive-core/log4j.xml
	server/astive-core/pom.xml

server/astive-core/src/main/java/com/phonytive/astive/server/AbstractAst
iveServer.java
	server/astive-core/src/main/java/com/phonytive/astive/server/AstDB.java

server/astive-core/src/main/java/com/phonytive/astive/server/AstObj.java

server/astive-core/src/main/java/com/phonytive/astive/server/AstiveExcep
tion.java

server/astive-core/src/main/java/com/phonytive/astive/server/AstiveServe
r.java

server/astive-core/src/main/java/com/phonytive/astive/server/AstivletPro
cessor.java

server/astive-core/src/main/java/com/phonytive/astive/server/ConnectionM
anager.java

server/astive-core/src/main/java/com/phonytive/astive/server/FastAgiConn
ectionManager.java

server/astive-core/src/main/java/com/phonytive/astive/server/FastAgiServ
erSocket.java

server/astive-core/src/main/java/com/phonytive/astive/server/MyAstDB.jav
a

server/astive-core/src/main/java/com/phonytive/astive/server/Service.jav
a

server/astive-core/src/main/java/com/phonytive/astive/server/SimpleAstiv
eServer.java

server/astive-core/src/main/java/com/phonytive/astive/server/SystemExcep
tion.java

server/astive-core/src/main/java/com/phonytive/astive/server/admin/Admin
Command.java

server/astive-core/src/main/java/com/phonytive/astive/server/admin/Admin
Daemon.java

server/astive-core/src/main/java/com/phonytive/astive/server/admin/Admin
DaemonClient.java

server/astive-core/src/main/java/com/phonytive/astive/server/appmanager/
Deployer.java

server/astive-core/src/main/java/com/phonytive/astive/server/appmanager/
DeployerManager.java

server/astive-core/src/main/java/com/phonytive/astive/server/monitor/Con
nectionMonitor.java

server/astive-core/src/main/java/com/phonytive/astive/server/monitor/Fas
tAgiConnectionMonitor.java

server/astive-core/src/main/java/com/phonytive/astive/server/monitor/Sim
pleConnectionMonitor.java

server/astive-core/src/main/java/com/phonytive/astive/server/utils/CopyF
ile.java

server/astive-core/src/main/java/com/phonytive/astive/server/utils/InitO
utput.java

server/astive-core/src/main/java/com/phonytive/astive/server/utils/ReadU
til.java

server/astive-core/src/main/java/com/phonytive/astive/server/utils/Servi
ceProperties.java

server/astive-core/src/main/java/com/phonytive/astive/server/utils/Servi
cePropertiesImpl.java

server/astive-core/src/main/java/com/phonytive/astive/server/utils/URLVa
lidator.java
	server/astive-core/src/main/resources/app.xml
	server/astive-core/src/main/resources/app.xsd

server/astive-core/src/test/java/com/phonytive/astive/server/test/AppObj
Test.java

server/astive-core/src/test/java/com/phonytive/astive/server/test/AppXml
Test.java

server/astive-core/src/test/java/com/phonytive/astive/server/test/Astivl
etRequestTest.java

server/astive-core/src/test/java/com/phonytive/astive/server/test/MyAsti
vlet.java

server/astive-core/src/test/java/com/phonytive/astive/server/test/Simple
AstiveServerTest.java

server/astive-core/src/test/java/com/phonytive/astive/server/test/URLVal
idatorTest.java

server/astive-core/src/test/java/com/phonytive/astive/server/test/app_te
st.xml
	server/astive-server/log4j.xml
	server/astive-server/pom.xml

server/astive-server/src/main/java/com/phonytive/astive/server/AstDB.jav
a

server/astive-server/src/main/java/com/phonytive/astive/server/AstObj.ja
va

server/astive-server/src/main/java/com/phonytive/astive/server/AstiveSer
ver.java

server/astive-server/src/main/java/com/phonytive/astive/server/MyAstDB.j
ava

server/astive-server/src/main/java/com/phonytive/astive/server/admin/Adm
inCommand.java

server/astive-server/src/main/java/com/phonytive/astive/server/appmanage
r/DeployerManager.java

server/astive-server/src/main/java/com/phonytive/astive/server/monitor/S
impleConnectionMonitor.java

server/astive-server/src/test/java/com/phonytive/astive/server/test/app_
test.xml

server/astive-telnet/src/main/java/com/phonytive/astive/telnet/ColorsANS
I.java

server/astive-telnet/src/main/java/com/phonytive/astive/telnet/TelnetCom
mand.java

server/astive-telnet/src/test/java/com/phonytive/astive/telnet/test/Teln
etServerTest.java
	server/atk-server-client/pom.xml

server/atk-server-client/src/main/java/org/astivetoolkit/astivlet/Astivl
etResponse.java
	server/atk-server-core/log4j.xml
	server/atk-server-core/pom.xml

server/atk-server-core/src/main/java/org/astivetoolkit/server/AstDB.java

server/atk-server-core/src/main/java/org/astivetoolkit/server/AstObj.jav
a

server/atk-server-core/src/main/java/org/astivetoolkit/server/AstiveServ
er.java

server/atk-server-core/src/main/java/org/astivetoolkit/server/MyAstDB.ja
va

server/atk-server-core/src/main/java/org/astivetoolkit/server/admin/Admi
nCommand.java

server/atk-server-core/src/main/java/org/astivetoolkit/server/appmanager
/DeployerManager.java

server/atk-server-core/src/main/java/org/astivetoolkit/server/monitor/Si
mpleConnectionMonitor.java
	server/atk-server-core/src/test/resources/app_test.xml
	server/atk-server-telnet/pom.xml

server/atk-server-telnet/src/main/java/org/astivetoolkit/telnet/TelnetSe
rver.java
	server/pom.xml
Conflict resolution
Conflict resolution
Conflict resolution
Conflict resolution
Conflict resolution
Conflict resolution
Update pom.xml
Conflict resolution
Conflict resolution
Update App.java
Conflict resolution
Conflict resolution
Conflict resolution
Conflict resolution
Merge branch 'master' into dev