Updated plugin-name.php to get all name replacement changes at one place
Replaced deleted comment block
Merge pull request #121 from akshayraje/master

All class and file name changes together
merge conflict resolution
Merge branch 'master' of https://github.com/tommcfarlin/WordPress-Plugin-Boilerplate
Revert "merge conflict resolution"

This reverts commit f293c94419fe450c08d31674ea20d7658a41b90c.
Revert "Replaced deleted comment block"

This reverts commit 630408340f4af748cabd3db2456c46e46f020e6f.
Revert "Updated plugin-name.php to get all name replacement changes at one place"

This reverts commit a80b2ca7a491fbc1d9e0c2aba6f110b3384b2c47.
Update class-plugin-name-admin.php

added possibility for super admin check in constructor and get_instance()
Merge pull request #122 from rockaut/master

Update class-plugin-name-admin.php
Extended and aligned comment header (via franz-josef-kaiser)
Revert "Extended and aligned comment header (via franz-josef-kaiser)"

This reverts commit 0f2675ddb4de63da4b1ffb9152fca5a2532dcdc7.
Removed the trailing slash

According to http://codex.wordpress.org/Function_Reference/plugin_dir_path, plugin_dir_path gets the filesystem directory path with trailing slash. Even tho two slashes will not cause an error, the extra slash can be removed.
Removed the trailing slash

According to http://codex.wordpress.org/Function_Reference/plugin_dir_path, plugin_dir_path gets the filesystem directory path with trailing slash. Even tho two slashes will not cause an error, the extra slash can be removed.
Merge pull request #125 from jameswlane/patch-2

Removed the trailing slash
Merge pull request #126 from jameswlane/patch-1

Removed the trailing slash
changing all 'TODO' to '@TODO'

changing all 'TODO' to '@TODO' so that they are easier to find in IDE's that support @TODO tags

Signed-off-by: Tom McFarlin <tom@tommcfarlin.com>
Changing 'decomment' to 'uncomment'

Signed-off-by: Tom McFarlin <tom@tommcfarlin.com>
updating the change log for 2.6.1

Signed-off-by: Tom McFarlin <tom@tommcfarlin.com>
removing white space, fixing text domain not loading

fixes #120

Signed-off-by: Tom McFarlin <tom@tommcfarlin.com>