Deleting this the second time now [AMECHE-327]
Reinstantiating the deleted code [AMECHE-327]
Re-instantiating reverted code [AMECHE-327]
Further refactoring code [AMECHE-327]
Re-instating deleted code [AMECHE-327]
Continuing on test cases [AMECHE-327]
Adding test cases and adding logic to mock classes [AMECHE-327]
Adding ability to create SipURI [AMECHE-327]
Formatting/Syntax [AMECHE-327]
Refactoring SipURI usage [AMECHE-327]
Syntax/Formatting [AMECHE-327]
Fixing test cases (Mock-approach) [AMECHE-327]
Refactoring more test cases [AMECHE-327]
Syntax/Formatting [AMECHE-327]
Test case refactoring (mock approach) [AMECHE-327]
Eclipse change [AMECHE-000]
Eclipse changes [AMECHE-000]
Merge remote-tracking branch 'origin/master'

Conflicts:
	rayo-server/src/main/java/com/rayo/server/ameche/SimpleRegexpAppInstanceResolver.java
Relocating and refactoring test cases [AMECHE-327]
Adding test case [AMECHE-327]