<!doctype html>
<html>

<head>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
    <title>Flex 4 AngularJS</title>
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <meta name="author" content="Brouer CODE">
    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
        <!-- javascript -->
    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.17/angular.js"></script>
    <script src="dist/flex4angular.min.js"></script>
    <script src="sample/sample.js"></script>
</head>

<body ng-app="faSample">
    <!-- Wrap all page content here -->

    <div data-ng-include="'sample/viewstack/ViewStack.html'" >
        <script src="sample/viewstack/ViewStackController.js"></script>
    </div>

    <div data-ng-include="'sample/panel/panel.html'" >
    </div>

</body>

</html>
Merge branch 'master' of https://github.com/brouercode/flex4angular.js

Conflicts:
	dist/flex4angular.min.js
	index.html