aaaa pusing!!
Merge branch 'master' of https://github.com/aongko/picMedia

Conflicts:
	build/classes/.gitignore
	build/classes/hibernate.cfg.xml
	resources/hibernate.cfg.xml
	src/controller/PhotoManagement.java
	src/model/Photo.java
	src/view/PhotoAction.java