Update class-plugin-name-admin.php

Changed @subpackage from 'includes' to 'admin'.
Update class-plugin-name-public.php

Updated @subpackage from 'admin' to 'public'
Merge pull request #220 from iamdmitrymayorov/master

Minor comment fix.
Change name -> plugin_name for consistency
Merge pull request #224 from mAAdhaTTah/variable-fix

Change name -> plugin_name for consistency
Merge branch 'master' of https://github.com/tommcfarlin/WordPress-Plugin-Boilerplate

# By Dmitry Mayorov (2) and mAAdhaTTah (1)
# Via Tom McFarlin (2) and mAAdhaTTah (1)
* 'master' of https://github.com/tommcfarlin/WordPress-Plugin-Boilerplate:
  Change name -> plugin_name for consistency
  Update class-plugin-name-public.php
  Update class-plugin-name-admin.php

Conflicts:
	plugin-name/app/Dashboard.php
	plugin-name/app/Web.php