modified:   log/development.log
	deleted:    tmp/pids/server.pid
Documentation and code cleaning
Merge branch 'Faselty-Beta.0.1' of https://github.com/Bdaya/BloodDonation into Faselty-Beta.0.1

Conflicts:
	log/development.log
	log/production.log
	tmp/cache/assets/C06/410/sprockets%2Fd5d610180d41683b413026db11264085
	tmp/cache/assets/CA0/DB0/sprockets%2Fb8d42949e061501a753d0e3a8be12522
	tmp/cache/assets/CA3/9C0/sprockets%2F87ac2ccd21d4531808088d10046e85b1
	tmp/cache/assets/CAA/1C0/sprockets%2F9e4eb9b5c137bb122240e406182d6488
	tmp/cache/assets/CAC/780/sprockets%2Fc1583a53234e018fe51a5541756e84dd
	tmp/cache/assets/CB0/BA0/sprockets%2F3a3f9a95a005318c1663a06d96d5469d
	tmp/cache/assets/CB5/890/sprockets%2F694657a6b18232adb2fc65605c933e75
	tmp/cache/assets/CDB/910/sprockets%2F26098b294d10eec3e946bb124334e5e4
	tmp/cache/assets/CDD/9B0/sprockets%2Fa1ee77c4a4b62568050d2641e21479ff
	tmp/cache/assets/CE7/AF0/sprockets%2F542c740f339d1e8da9da64cc19145929
	tmp/cache/assets/D02/0A0/sprockets%2F4ad413f3e3326481d2f5f9327bbd0e12
	tmp/cache/assets/D04/8D0/sprockets%2F3ba01fe3782e81c4c0296c4574ea3a17
	tmp/cache/assets/D0D/A30/sprockets%2F81d7b9095f23e170df5a7263f004c8bc
	tmp/cache/assets/D21/CC0/sprockets%2F5aedca135a26c247cbd720231034e09c
	tmp/cache/assets/D3A/FA0/sprockets%2F17f9158c323cc3dcd1d8b76035d1db47
	tmp/cache/assets/D3C/970/sprockets%2F3b025e646d50aafb2b20578c6d76a98f
	tmp/cache/assets/D3D/BA0/sprockets%2F4ebf630396afc44a3ff3036b847dd442
	tmp/cache/assets/D49/710/sprockets%2F3046fd87096a3880bf3ed5620efa95de
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D5D/AC0/sprockets%2Fceb0ddaaf86c572ad16725584b01431b
	tmp/cache/assets/D62/2B0/sprockets%2F8d191acdf6ab107ba6640a2f3875e25a
	tmp/cache/assets/D66/E60/sprockets%2F85ae64edf528ce6e981889f3f3c285d9
	tmp/cache/assets/D69/530/sprockets%2Fba654be5a3d535ab71faefb270926908
	tmp/cache/assets/D76/2F0/sprockets%2Fe1e58e8abcac62b54cf2c47a79960546
	tmp/cache/assets/D8D/3B0/sprockets%2F640543afaf1a1a6d7a82d19bc0854beb
	tmp/cache/assets/D90/270/sprockets%2F06bd7e37da3a0a4abb2b4c84947624dd
	tmp/cache/assets/D9F/1A0/sprockets%2F98847aea6af8901adb9eb5bd4af02118
	tmp/cache/assets/DA3/050/sprockets%2F9f98bbb8d598b474005722a1cbdbb4ef
	tmp/cache/assets/DAF/7A0/sprockets%2Fe64641ccfd84b58a67d830edb9d6cf82
	tmp/cache/assets/DB4/EA0/sprockets%2Ffde41fb503111b0aa4aab4f4d894d4e1
	tmp/cache/assets/DCE/C70/sprockets%2F2beb370eb96a5bbe87527a5d4f1f1ea9
	tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/DEE/D00/sprockets%2F9f267bdd1beb3754bda00df07c1c41cf
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/E2F/830/sprockets%2Fd2c8b448aad9560ef8e265aaeeadf3c4
	tmp/cache/assets/E6B/3E0/sprockets%2Faf3adde4b1a7bf0bc83c02cab6d05ae0