Commit 21 Aug 2014
Merge branch 'master' of https://github.com/lightbase/WSCacicNeo

Conflicts:
	development.ini