Created Admin/Modules controll
Adapted to new version of original code, little differences in module/Web/Admin/config/module.config.php caused by my changes in project
Merge remote-tracking branch 'upstream/master'
Added first version of affix plugin to the modules controll
Affix works, somehow
Modules manager works with affix and scrollspy
removed TestModule and TestModule2
Merge branch 'master' of git://github.com/psychowico/Alcarin

Conflicts:
	composer.phar
	config/autoload/global.php
	module/Web/Admin/config/module.config.php
	module/Web/Admin/static/coffee/Orbis/gateways.coffee
	module/Web/Alcarin/static/coffee/Alcarin/update-hash-link.coffee
merged with original project by psychowico
synchronized with psychowicos project
Merge pull request #52 from emu23/master

Module Manager added