working on mockup
updating html mockups
Merge pull request #2 from naisnouk/html_mockup

working on mockup
Merge branch 'html_mockup' of github.com:ercchy/actifaction into html_mockup
working on templates
added settings_local.py to .gitignore
Merge branch 'html_mockup'
working on templates
Sample data for actions
Merge pull request #18 from sparkica/fea_login

Sample data for actions
Merge pull request #17 from ercchy/master

Working on templates
Moved sample data to fixtures map unser api
Merge pull request #19 from sparkica/fea_fixture

Moved sample data to fixtures map under api
Cleaning...
Merge branch 'fea_fixture'
Merge pull request #20 from sparkica/master

Cleaning....
merging from hana
Merge pull request #21 from ercchy/master

Working on templates
Added login, no registration yet
Merge pull request #22 from sparkica/fea_registration

Added login, no registration yet