Weconnect
Merge branch 'master' of https://github.com/alexfrndz/A3M

Conflicts:
	application/config/config.php