Squashed commit of the following:

commit 39a2ce70297e22d0895b268aab6499f4d459b54e
Author: Shane Walters <swalters@singletreetech.com>
Date:   Thu Aug 28 09:09:29 2014 -0500

    fix comments

commit f97c574e8cf35ebff74f12285a503af754f1e16a
Merge: 1b1f8fe c29c006
Author: Shane Walters <swalters@singletreetech.com>
Date:   Thu Aug 28 09:07:50 2014 -0500

    fix comments

commit 1b1f8fe7ad3e5d23d0b4489b410e504ef65384ac
Author: novice3030 <novice3030@gmail.com>
Date:   Thu Aug 28 08:53:22 2014 +0300

    merged from master

commit c4726d34bfe9078fcac25040bf483d2879b1193b
Author: novice3030 <novice3030@gmail.com>
Date:   Thu Aug 28 08:51:02 2014 +0300

    merged from master

commit 65b878fc3d8e6b490660e4cbdc5a226964921f90
Author: novice3030 <novice3030@gmail.com>
Date:   Thu Aug 28 08:48:07 2014 +0300

    merge from master

commit 231ce3906dbb50c3433a36a354234d159ecc18c0
Author: novice3030 <novice3030@gmail.com>
Date:   Thu Aug 28 08:40:55 2014 +0300

    grid footer