Amos Haviv c7a14f8386 Merge branch 'pr/24' into 0.3.0 ...

Conflicts:
	config/env/all.js
	config/express.js
	package.json

2014-04-23 19:53:59 +03:00

..

users.client.config.js

More Naming Fixes, articles cleanup

2014-04-21 02:32:59 +03:00

users.client.routes.js

Merge branch 'pr/24' into 0.3.0

2014-04-23 19:53:59 +03:00