Merge branch 'master' of github.com:wingman007/fmi

Conflicts:
	.c9revisions/config/autoload/global.php.c9save
	.c9revisions/module/Application/config/module.config.php.c9save
	.gitignore
	README.md
	config/application.config.php
	config/autoload/README.md
	config/autoload/global.php
	index.php
	module/Album/Module.php
	module/Album/config/module.config.php
	module/Album/src/Album/Controller/AlbumController.php
	module/Album/src/Album/Form/AlbumForm.php
	module/Album/src/Album/Model/Album.php
	module/Album/src/Album/Model/AlbumTable.php
	module/Album/view/album/album/add.phtml
	module/Album/view/album/album/delete.phtml
	module/Album/view/album/album/edit.phtml
	module/Album/view/album/album/index.phtml
	module/Application/config/module.config.php
	module/Application/view/application/index/index.phtml
	module/Application/view/layout/layout.phtml
	public/.htaccess

.c9revisions/README.md.c9save

@@ -0,0 +1 @@
+{"ts":1360917272605,"silentsave":true,"restoring":false,"patch":[[{"diffs":[[1,"This is a sample PHP project\n\nZendSkeletonApplication\n=======================\n\nIntroduction\n------------\nThis is a simple, skeleton application using the ZF2 MVC layer and module\nsystems. This application is meant to be used as a starting place for those\nlooking to get their feet wet with ZF2.\n\n\nInstallation\n------------\n\nUsing Composer (recommended)\n----------------------------\nThe recommended way to get a working copy of this project is to clone the repository\nand use composer to install dependencies:\n\n    cd my/project/dir\n    git clone git://github.com/zendframework/ZendSkeletonApplication.git\n    cd ZendSkeletonApplication\n    php composer.phar install\n\nUsing Git submodules\n--------------------\nAlternatively, you can install using native git submodules:\n\n    git clone git://github.com/zendframework/ZendSkeletonApplication.git --recursive\n\nVirtual Host\n------------\nAfterwards, set up a virtual host to point to the public/ directory of the\nproject and you should be ready to go!\n\n"]],"start1":0,"start2":0,"length1":0,"length2":997}]],"length":997}

.c9revisions/StoyanAtanasoff.php.c9save

@@ -0,0 +1,12 @@
+{"ts":1359709576891,"silentsave":true,"restoring":false,"patch":[[]],"length":0}
+{"contributors":[],"silentsave":true,"ts":1359709580066,"patch":[[{"diffs":[[1,"<?php\n    ec"]],"start1":0,"start2":0,"length1":0,"length2":12}]],"length":12,"saved":false}
+{"ts":1359709581371,"patch":[[{"diffs":[[0,"p\n    ec"],[1,"ho\"\""]],"start1":4,"start2":4,"length1":8,"length2":12}]],"length":16,"saved":false}
+{"ts":1359709583714,"patch":[[{"diffs":[[0,"    echo"],[-1,"\""],[1," \"Stoyan A"],[0,"\""]],"start1":6,"start2":6,"length1":10,"length2":19}]],"length":25,"saved":false}
+{"ts":1359709584324,"patch":[[{"diffs":[[0,"Stoyan A"],[1,"tanas"],[0,"\""]],"start1":16,"start2":16,"length1":9,"length2":14}]],"length":30,"saved":false}
+{"ts":1359709585612,"patch":[[{"diffs":[[0,"n Atanas"],[1,"off "],[0,"\""]],"start1":21,"start2":21,"length1":9,"length2":13}]],"length":34,"saved":false}
+{"ts":1359709586478,"patch":[[{"diffs":[[0,"anasoff "],[1,"!"],[0,"\""]],"start1":25,"start2":25,"length1":9,"length2":10}]],"length":35,"saved":false}
+{"ts":1359709590095,"patch":[[{"diffs":[[0,"asoff !\""],[1,";\n?>"]],"start1":27,"start2":27,"length1":8,"length2":12}]],"length":39,"saved":false}
+{"ts":1359709603971,"patch":[[{"diffs":[[0,"oyan Ata"],[1,"ec"],[0,"nasoff !"]],"start1":18,"start2":18,"length1":16,"length2":18},{"diffs":[[0,"soff !\";"],[1,"h"],[0,"\n?>"]],"start1":30,"start2":30,"length1":11,"length2":12}]],"length":42,"saved":false}
+{"ts":1359709605234,"patch":[[{"diffs":[[0,"soff !\";"],[-1,"h"],[0,"\n?>"]],"start1":30,"start2":30,"length1":12,"length2":11}]],"length":41,"saved":false}
+{"ts":1359709611632,"patch":[[{"diffs":[[0,"oyan Ata"],[-1,"e"],[0,"cnasoff "]],"start1":18,"start2":18,"length1":17,"length2":16}]],"length":40,"saved":false}
+{"ts":1359709615577,"patch":[[{"diffs":[[0," Ata"],[-1,"c"],[0,"n"],[1,"as"],[0,"asof"]],"start1":22,"start2":22,"length1":10,"length2":11}]],"length":41,"saved":false}

.c9revisions/StoyanCheresharov/css/exp.css.c9save

@@ -0,0 +1,2 @@
+{"ts":1361703623298,"silentsave":true,"restoring":false,"patch":[[]],"length":0}
+{"contributors":[],"silentsave":false,"ts":1361703643427,"patch":[[{"diffs":[[1,"h1 {\n    color: red;    \n}"]],"start1":0,"start2":0,"length1":0,"length2":26}]],"length":26,"saved":false}

.c9revisions/StoyanCheresharov/css/exp_bg.css.c9save

@@ -0,0 +1 @@
+{"ts":1361520632903,"silentsave":true,"restoring":false,"patch":[[]],"length":0}

.c9revisions/StoyanCheresharov/exp_bg.html.c9save

@@ -0,0 +1,4 @@
+{"ts":1361520348700,"silentsave":true,"restoring":false,"patch":[[]],"length":0}
+{"contributors":[],"silentsave":false,"ts":1361520420246,"patch":[[{"diffs":[[1,"<!DOCTYPE html>\n<html>\n    <head>\n        <title>Exp BG</title>\n    </head>\n    <body>\n        <h1>Exp BG</h1>\n    </body>\n</html>"]],"start1":0,"start2":0,"length1":0,"length2":130}]],"length":130,"saved":false}
+{"ts":1361520615381,"patch":[[{"diffs":[[0,"/title>\n"],[1,"        <link rel=\"stylesheet\" href=\"css/exp_bg.css\" type=\"text/css\" medea=\"screen\" title=\"exp_bg\" />\n"],[0,"    </he"]],"start1":56,"start2":56,"length1":16,"length2":118}]],"length":232,"saved":false}
+{"ts":1361520731952,"patch":[[{"diffs":[[0,"_bg\" />\n"],[1,"        <script type=\"text/javascript\" src=\"js/exp_bg.js\"></script>\n"],[0,"    </he"]],"start1":158,"start2":158,"length1":16,"length2":84}]],"length":300,"saved":false}

.c9revisions/StoyanCheresharov/exp_bg.txt.c9save

@@ -0,0 +1,3 @@
+{"ts":1361528329647,"silentsave":true,"restoring":false,"patch":[[]],"length":0}
+{"contributors":[],"silentsave":false,"ts":1361528343497,"patch":[[{"diffs":[[1,"This text comes from the server"]],"start1":0,"start2":0,"length1":0,"length2":31}]],"length":31,"saved":false}
+{"ts":1361528633170,"patch":[[{"diffs":[[1,"<h1>This is a title</h1><p>"],[0,"This tex"]],"start1":0,"start2":0,"length1":8,"length2":35},{"diffs":[[0,"e server"],[1,"</p>"]],"start1":50,"start2":50,"length1":8,"length2":12}]],"length":62,"saved":false}

.c9revisions/StoyanCheresharov/index.html.c9save

@@ -0,0 +1,6 @@
+{"ts":1360862909416,"silentsave":true,"restoring":false,"patch":[[]],"length":0}
+{"contributors":[],"silentsave":false,"ts":1360863042611,"patch":[[{"diffs":[[1,"<!DOCTYPE html>\n<html>\n    <head>\n        <title>JS experiments</title>\n        <script type=\"text/javascript\" src=\"js/experiment.js\"/>\n        <link\n    </head>\n</html>"]],"start1":0,"start2":0,"length1":0,"length2":169}]],"length":169,"saved":false}
+{"contributors":[],"silentsave":false,"ts":1360863105031,"patch":[[{"diffs":[[0,"/exp"],[-1,"eriment.js\"/"],[1,".js\"></script"],[0,">\n  "]],"start1":118,"start2":118,"length1":20,"length2":21},{"diffs":[[0,"link"],[-1,"\n    </head"],[1," type=\"text/css\" rel=\"stylesheet\" href=\"exp.css\" media=\"screen\" title=\"stoyan\"/>\n    </head>\n    <body>\n        <h1>Exp</h1>\n    </body"],[0,">\n</"]],"start1":146,"start2":146,"length1":19,"length2":143}]],"length":294,"saved":false}
+{"contributors":[],"silentsave":false,"ts":1361526465318,"patch":[[{"diffs":[[0,"xp</h1>\n"],[1,"        <div>Test</div>\n"],[0,"    </bo"]],"start1":267,"start2":267,"length1":16,"length2":40}]],"length":318,"saved":false}
+{"ts":1361526502010,"patch":[[{"diffs":[[0,"   <"],[-1,"div"],[1,"h1"],[0,">Test</"],[-1,"div"],[1,"h1"],[0,">\n  "]],"start1":280,"start2":280,"length1":21,"length2":19}]],"length":316,"saved":false}
+{"contributors":[],"silentsave":false,"ts":1361703667220,"patch":[[{"diffs":[[0,"\" href=\""],[1,"css/"],[0,"exp.css\""]],"start1":182,"start2":182,"length1":16,"length2":20}]],"length":320,"saved":false}

.c9revisions/StoyanCheresharov/js/exp.js.c9save

@@ -0,0 +1,26 @@
+{"ts":1360863437639,"silentsave":true,"restoring":false,"patch":[[]],"length":0}
+{"contributors":[],"silentsave":false,"ts":1360863469983,"patch":[[{"diffs":[[1,"(function(){\n alert('Hello World!');\n})();"]],"start1":0,"start2":0,"length1":0,"length2":42}]],"length":42,"saved":false}
+{"ts":1360863536021,"patch":[[{"diffs":[[0,"){\n "],[-1,"alert('Hello World!')"],[1,"   window.onload = function(e){\n        var elements = document.getElementsByTagname('h1');\n    }"],[0,";\n})"]],"start1":10,"start2":10,"length1":29,"length2":105}]],"length":118,"saved":false}
+{"ts":1360863684147,"patch":[[{"diffs":[[0,"    var "],[1,"elements, i=0;\n        "],[0,"elements"]],"start1":50,"start2":50,"length1":16,"length2":39},{"diffs":[[0,"ntsByTag"],[-1,"n"],[1,"N"],[0,"ame('h1'"]],"start1":109,"start2":109,"length1":17,"length2":17},{"diffs":[[0,"('h1');\n"],[1,"        for (i=0; i < elements.length; i++) {\n            alert(elements[i]);\n        }\n"],[0,"    };\n}"]],"start1":121,"start2":121,"length1":16,"length2":104}]],"length":229,"saved":false}
+{"ts":1360863806287,"patch":[[{"diffs":[[0,"ts[i]);\n"],[1,"            elements[i].style.color = 'red';\n"],[0,"        "]],"start1":199,"start2":199,"length1":16,"length2":61}]],"length":274,"saved":false}
+{"ts":1360863885975,"patch":[[{"diffs":[[1,"\n\n/*\n"],[0,"(functio"]],"start1":0,"start2":0,"length1":8,"length2":13},{"diffs":[[0,"};\n})();"],[1,"\n*/"]],"start1":271,"start2":271,"length1":8,"length2":11}]],"length":282,"saved":false}
+{"ts":1360864021012,"patch":[[{"diffs":[[0,"})();\n*/"],[1,"\n\nfunction myExample() {\n    var name = 'Stoyan';\n    alert(name);\n}\n\nalert(myExample);\nalert(myExample());\nalert(new myExample());\n"]],"start1":274,"start2":274,"length1":8,"length2":140}]],"length":414,"saved":false}
+{"contributors":[],"silentsave":false,"ts":1361516462455,"patch":[[{"diffs":[[0,"t(new myExample());\n"],[1,"\nfunction MyTestClass() {\n    this.name = 'Stoyan';\n    this.sayHello = function(){\n        console.log(this.name);\n    };\n}\n"]],"start1":394,"start2":394,"length1":20,"length2":145}]],"length":539,"saved":false}
+{"ts":1361516526009,"patch":[[{"diffs":[[0,");\n    };\n}\n"],[1,"\nvar myTestObject = new MyTestClass();\n"]],"start1":527,"start2":527,"length1":12,"length2":51}]],"length":578,"saved":false}
+{"ts":1361516562412,"patch":[[{"diffs":[[0,"estClass();\n"],[1,"myTestObject.sayHello();"]],"start1":566,"start2":566,"length1":12,"length2":36}]],"length":602,"saved":false}
+{"ts":1361516597178,"patch":[[{"diffs":[[0,"Hello();"],[1,"\n\nconsole.log(name);"]],"start1":594,"start2":594,"length1":8,"length2":28}]],"length":622,"saved":false}
+{"ts":1361516639601,"patch":[[{"diffs":[[0,"ole.log("],[1,"'I should say the name: ' + "],[0,"name);"]],"start1":608,"start2":608,"length1":14,"length2":42}]],"length":650,"saved":false}
+{"ts":1361516664684,"patch":[[{"diffs":[[0,"llo();\n\n"],[1," MyTestClass();\n\n"],[0,"console."]],"start1":596,"start2":596,"length1":16,"length2":33}]],"length":667,"saved":false}
+{"ts":1361516728083,"patch":[[{"diffs":[[0,"());"],[-1,"\n\nfunction MyTestClass() {\n    this.name = 'Stoyan';\n    this.sayHello = function(){\n        console.log(this.name);\n    };\n}\n\nvar myTestObject = new MyTestClass();\nmyTestObject.sayHello();\n\n MyTestClass();\n\nconsole.log('I should say the name: ' + name);"]],"start1":409,"start2":409,"length1":258,"length2":4}]],"length":413,"saved":false}
+{"contributors":[],"silentsave":false,"ts":1361703720589,"patch":[[{"diffs":[[0,")();\n*/\n"],[1,"/*"],[0,"\nfunctio"]],"start1":275,"start2":275,"length1":16,"length2":18},{"diffs":[[0,"rt(new myExample());"],[1,"\n*/"]],"start1":395,"start2":395,"length1":20,"length2":23}]],"length":418,"saved":false}
+{"ts":1361703725590,"patch":[[{"diffs":[[-1,"\n\n"],[0,"/*\n(func"]],"start1":0,"start2":0,"length1":10,"length2":8}]],"length":416,"saved":false}
+{"ts":1361703752951,"patch":[[{"diffs":[[0,")();\n*/\n"],[-1,"/*"],[0,"\nfunctio"]],"start1":273,"start2":273,"length1":18,"length2":16},{"diffs":[[0,"ple());\n"],[-1,"*/"],[1,"\n\n"]],"start1":404,"start2":404,"length1":10,"length2":10}]],"length":414,"saved":false}
+{"ts":1361703763571,"patch":[[{"diffs":[[0,"me);\n}\n\n"],[1,"// "],[0,"alert(my"]],"start1":342,"start2":342,"length1":16,"length2":19},{"diffs":[[0,"ample);\n"],[1,"// "],[0,"alert(my"]],"start1":363,"start2":363,"length1":16,"length2":19},{"diffs":[[0,"ple());\n"],[1,"// "],[0,"alert(ne"]],"start1":386,"start2":386,"length1":16,"length2":19}]],"length":423,"saved":false}
+{"ts":1361703859414,"patch":[[{"diffs":[[0,"le());\n\n"],[1,"alert(typeof myExample);"],[0,"\n"]],"start1":414,"start2":414,"length1":9,"length2":33}]],"length":447,"saved":false}
+{"ts":1361703886153,"patch":[[{"diffs":[[0,"(typeof myExample);\n"],[1,"alert(myExample instanceof Object);\n"]],"start1":427,"start2":427,"length1":20,"length2":56}]],"length":483,"saved":false}
+{"ts":1361703954718,"patch":[[{"diffs":[[0,"bject);\n"],[1,"myExample.prop1 = 'Roperty 1';\n"]],"start1":475,"start2":475,"length1":8,"length2":39}]],"length":514,"saved":false}
+{"ts":1361704056556,"patch":[[{"diffs":[[0,"rty 1';\n"],[1,"console.log(myExample.prop1);\n"]],"start1":506,"start2":506,"length1":8,"length2":38}]],"length":544,"saved":false}
+{"ts":1361704306220,"patch":[[{"diffs":[[0,"prop1);\n"],[1,"var myGlobalFunction = function(param1){\n    return param1;\n};\n\nconsole.log(myGlobalFunction('Stoyan'));"]],"start1":536,"start2":536,"length1":8,"length2":112}]],"length":648,"saved":false}
+{"ts":1361704447079,"patch":[[{"diffs":[[0,"oyan'));"],[1,"\n\nfunction myNextFunction(param1) {\n    return param1;\n}\n\nalert(myNextFunction(myGlobalFunction));"]],"start1":640,"start2":640,"length1":8,"length2":106}]],"length":746,"saved":false}
+{"ts":1361704515469,"patch":[[{"diffs":[[0,"();\n*/\n\n"],[1,"/*\n"],[0,"function"]],"start1":274,"start2":274,"length1":16,"length2":19},{"diffs":[[0,"ction));"],[1,"\n*/\n\n"]],"start1":741,"start2":741,"length1":8,"length2":13}]],"length":754,"saved":false}
+{"ts":1361704569483,"patch":[[{"diffs":[[0,"\n/*\n"],[-1,"function myExample() {\n    var name = 'Stoyan';\n    alert(name);\n}\n\n// alert(myExample);\n// alert(myExample());\n// alert(new myExample());\n\n"],[0,"aler"]],"start1":281,"start2":281,"length1":148,"length2":8},{"diffs":[[0,"tion));\n*/\n\n"],[1,"function myExample() {\n    var name = 'Stoyan';\n    alert(name);\n}\n\nalert(myExample);\nalert(myExample());\nalert(new myExample());\n\n\n"]],"start1":602,"start2":602,"length1":12,"length2":144}]],"length":746,"saved":false}