Merge origin/master

Conflicts:
	ReduxCore/framework.php
	class.redux-plugin.php
	redux-framework.php

Signed-off-by:KProvance <[email protected]>

Author: kprovance

ReduxCore/framework.php

@@ -73,6 +73,7 @@ class ReduxFramework {
             // ATTENTION DEVS
             // Please update the build number with each push, no matter how small.
             // This will make for easier support when we ask users what version they are using.
+
             public static $_version = '3.5.0';
             public static $_dir;
             public static $_url;

class.redux-plugin.php

@@ -25,6 +25,7 @@ class ReduxFrameworkPlugin {
              * @const       string VERSION The plugin version, used for cache-busting and script file references
              * @since       3.0.0
              */
+
             const VERSION = '3.5.0';
 
             /**

redux-framework.php

@@ -23,7 +23,7 @@
  * @author          Kevin Provance <[email protected]>
  * @author          Daniel J Griffiths <[email protected]>
  * @license         GNU General Public License, version 3
- * @copyright       2012-2014 Redux Framework
+ * @copyright       2012-2015 Redux Framework
  */
 
 // Exit if accessed directly