typo correction
Merge branch 'master' of https://github.com/crazychip/AAM into devel

Pulling last minute changes from master
move configuration file to config.php.sample

changing the configuration file name.
Merge pull request #1 from crazychip/devel

Devel